go back to previous layout
derp
Merge branch 'master' of https://github.com/wnajar/ezrahub

Conflicts:
	public/css/main.css