play init
Merge branch 'master' of https://github.com/ryuneeee/shareFit

Conflicts:
	.gitignore