Pulling from develop
Resolving README conflict
Caroline Testing commit
Merge branch 'develop' of https://github.com/alexpchin/cheerups into develop