Merge branch 'master' of https://github.com/svaldivia/Van-Game-Jam

Conflicts:
	game/Assets/Controllers/IdleRunJump.controller
Merge branch 'master' of https://github.com/svaldivia/Van-Game-Jam

Conflicts:
	game/Assets/Level1.unity
	game/Assets/Prefabs/PowerUps/HeartDown.prefab