Add first commmit
Merge branch 'master' of github.com:mimiguo/PlayerPrototype

Conflicts:
	.gitignore