Hello
Conflict
commit
added delete
added delete
updated delete
Merge branch 'team8-elison' of https://github.com/SeaUnivCs/FreshTomatoSaasApp
Added New view and application.css
Added create
Update create
Edit haml
Update added
_movie_form haml
movie_form haml edit
controller commit
prepull from master
Pulled from master
After Assignment
merge files
pull