Dodge
Merge branches 'master' and 'master' of https://github.com/BjarkeHou/ProjectGuard

Conflicts:
	ProjectGuard/Assets/Scenes/CollisionFightingTest.unity
Dodge 2.0
Merge branch 'master' of https://github.com/BjarkeHou/ProjectGuard