first commit
Merge git://github.com/sophAi/M43_Happiness

Conflicts:
	README.md