init
Merge branch 'master' of github.com:ray-ray/WakePlay

Conflicts:
	.gitignore
--ours