styling
Merge branch 'master' of https://github.com/jornare/CXBird

Conflicts:
	public/stylesheets/style.css
	public/stylesheets/style.styl
	views/menu.jade