Fixes for top nav
Fixing syntax bugs
Merge branch 'master' of github.com:matt-west/treebook

Conflicts:
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	db/schema.rb
Merge pull request #4 from matt-west/master

Fixed syntax issues to get tests running again