Changed database.yml and deployed application in heroku
Merged changes for google API
Resolved conflicts
Added like functionality with athlete profiles