Stuff...so I can push
Merge branch 'master' of https://github.com/svaldivia/Van-Game-Jam

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