added index view
made a test change
Merge pull request #1 from kaifius/kai_test

Kai test
switched db to pg
Merge pull request #5 from kaifius/add_postgres

switched db to pg
devise installed and models generated
Merge pull request #6 from kaifius/add_devise

devise installed and models generated
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