adds new styling
Merge branch 'newstyle'

Conflicts:
	Gemfile
	app/views/layouts/_nav.html.erb
	app/views/layouts/application.html.erb