updated with pods and cleaned up commit history
set up models, set up views, set up view controllers
required user stories complete
fixed merge conflicts
Merge branch 'master' of github.com:NinjaSudo/RottenTomato