Merge branch 'master' of https://github.com/olaround/web-popcorn
Updated gitignore
Removed app.json from .gitignore
Removed uploads from repo tracking
Updated gitignore
Added a README.md into the uploads directory since blank directories are not supported by git
Merge branch 'master' into live