there is things we shouldn't keep here
Merge branch 'master' of https://github.com/zrrz/BallAgainstWall

Conflicts:
	Assets/Intro.unity
	Assets/Main.unity
	Assets/Models/Characterjump.controller
	Assets/Models/Rig_animation.FBX.meta
	Assets/Scripts/Enemy.cs
	Assets/Texture_resources/CharaterMaterials/Character_Toony-BasicOutline.mat