Initial commit
Merge branch 'master' of github.com:yjkogan/friend-emotions

Conflicts:
	.gitignore