Hehe
Merge branch 'master' of https://github.com/adelagon/Emote

Conflicts:
	README
Merge branch 'master' of https://github.com/adelagon/Emote

Conflicts:
	README
Merge branch 'master' of https://github.com/adelagon/Emote

Conflicts:
	README