Fix Main Camera and Add Player and Enemy Assets
Merge pull request #1 from uryu1994/uryu1994/editdata

Fix Main Camera and Add Player and Enemy Assets
Merge branch 'master' into uryu1994/edit2

Conflicts:
	unity-testProject/Assets/main.unity