added comment to clips create
Merge branch 'master' of https://github.com/kaifius/wdi-group-project
added views and mock up controllers, updated models
merged player with amazon s3 upload