Column tweaks
Merge branch 'master' of github.com:wheresthebear/frontend

Conflicts:
	views/index.jade