init to git
Merge https://github.com/krisnasambora/merchant-of-emotion

Conflicts:
	.gitignore