Preparing to merge
Merge branch 'master' of https://github.com/ctmanuel/HappiestAppInTheWorld

Conflicts:
	HelloWorld/res/values/strings.xml