updated changes
Merge branch 'master' of https://github.com/Gamerholic/heartappy
updated changes