Without git file
Merge branch 'develop' of github.com:alexpchin/cheerups into develop
Without git file