adding emoticon
Merge remote-tracking branch 'heroku'
profile picture on settings page
profile picture on settings page
adding emoticon
Merge remote-tracking branch 'heroku'
adding emoticon
adding emoticon
adding emoticon
adding emoticon
Merge branch 'master' of heroku.com:young-atoll-2095
adding emoticon
Merge remote-tracking branch 'heroku'
adding emoticon
adding emoticon
change pic
Merge branch 'master' of heroku.com:young-atoll-2095