eliminating conflicts
task and sidebar-first menu styling
wtf?!?!?!? Why does git write this stash stuff into the files?
Increased height of header
increased header height, part 2: the reawakening
partial implementation of the new header images
Merge branch 'refs/heads/master' into test