First commit
Merge branch 'master' of https://github.com/jnst/play-training

Conflicts:
	.gitignore