Added CSS and stuff for the navbar
Merge branch 'master' of https://github.com/yawhide/forheroku

Conflicts:
	public/css/styles.css