added comment to clips create
Merge branch 'master' of https://github.com/kaifius/wdi-group-project
added heroku gems to gemfile
merging gemfile changes for heroku init
resolved gemfile merge conflicts
removed rb-fsevent from gemfile
added unicorn
added procfile
basic paperclip image
Merge branch 'jay_paperclip' of https://github.com/JSchulhof/wdi-group-project into JSchulhof-jay_paperclip
installed sunspot, annotated models
added relationships to clip and user models
added tags model and changed clips>private to is_private
add sunspot/solr indexing
working file upload
adding to search results view
Merge branch 'jay_paperclip' of https://github.com/JSchulhof/wdi-group-project into JSchulhof-jay_paperclip

Conflicts:
	Gemfile.lock
added views and mock up controllers, updated models
merged player with amazon s3 upload
adding mp3s to test with