Remerge - #1

Open

buhanec wants to merge 6 commits into

Commits on Mar 9, 2015

ignoring cs257
buhanec
committed
ac14292
merged 1+2 and 3+4
buhanec
committed
229c57a
back to 30 fucking 7
buhanec
committed
f66d220
l1+2 l3+4 profiling before fixing
buhanec
committed
aa58671
almost done
buhanec
committed
aaa88a4

Commits on Mar 10, 2015

pre-master merge
buhanec
committed
1a924e2