added views from previous app, will need to test once routes are setup
Merge branch 'master' of github.com:BLNorris/project-rails
Merge branch 'master' into add_associations