Merge
Merge branch 'master' of https://github.com/SUMDude21/project_capcom

Conflicts:
	Assets/Scripts/Player.cs