commit
Merge branch 'master' of github.com:Conflei/IndiesVSPewDiePie
lol
Merge branch 'master' of github.com:Conflei/IndiesVSPewDiePie

Conflicts:
	Game/Assets/Scripts/Characters/Character.cs
Merge branch 'master' of github.com:Conflei/IndiesVSPewDiePie