Updated Gemfile.lock file
added index.html file
update Gemfile.lock.file
added Gemfile.lock
Merge branch 'team8-elison' of https://github.com/SeaUnivCs/FreshTomatoSaasApp into team8-elison
Merge branch 'team4-john' of https://github.com/SeaUnivCs/FreshTomatoSaasApp into team4-john
removed index2.html
testing merge
clean up index
Changed team number from 1 to 4
added movies_controller; initial db migration built
merged in master
Merge branch 'team4-john' of https://github.com/SeaUnivCs/FreshTomatoSaasApp into team4-john
added show to movies_controller; updated Gemfile to include haml gem
added haml gem version constraint to Gemfile
added edit, update, destroy controllers
added application.html.haml; removed application.html.erb
added show.html.haml to views
fixed release_date typo in show view
added edit and new .html.haml files; added link to add movie to views/movies/index.html