adding ruby version for heroku
updating the database to postgresql
updating with merge
updating gemfile lock
Merge branch 'priya121-master'
adding facebook yml
adding activity
adding an activity into the DB
css
MVP