added routes
working on links
menus
added menu partial, included in capital hill page
layout
Merge branch 'master' of github.com:JessicaG/slice_works_clone
removed additional public folder
merge conflicts in views
heroku database testing
heroku db testing
jeffs change
Merge branch 'master' of github.com:JessicaG/slice_works_clone
Merge branch 'master' into luke

Conflicts:
	lib/app.rb