Merge branch '2D_branch' of https://github.com/JordanStone/CS345BeatEmUp into 2D_branch

Conflicts:
	Assets/Animations/BoxTest.controller
	Assets/Animations/Character/Character_SpriteSheets.meta
	Assets/Animations/Character/Character_SpriteSheets/attack1.png
	Assets/Animations/Character/Character_SpriteSheets/attack1.png.meta
	Assets/Animations/Character/Character_SpriteSheets/attack1_0.controller

Assets/Animations/Character/Character_SpriteSheets/attack1_0.controller.
meta
	Assets/Animations/Character/Character_SpriteSheets/attack2.png
	Assets/Animations/Character/Character_SpriteSheets/attack2.png.meta
	Assets/Animations/Character/Character_SpriteSheets/attack2_0.controller

Assets/Animations/Character/Character_SpriteSheets/attack2_0.controller.
meta
	Assets/Animations/Character/Character_SpriteSheets/attack3.png
	Assets/Animations/Character/Character_SpriteSheets/attack3.png.meta
	Assets/Animations/Character/Character_SpriteSheets/attack3_0.controller

Assets/Animations/Character/Character_SpriteSheets/attack3_0.controller.
meta
	Assets/Animations/Character/Character_SpriteSheets/idle_0.controller

Assets/Animations/Character/Character_SpriteSheets/idle_0.controller.met
a
	Assets/Animations/Character/Character_SpriteSheets/jump_0.controller

Assets/Animations/Character/Character_SpriteSheets/jump_0.controller.met
a
	Assets/Animations/Character/Character_SpriteSheets/newIdle.anim
	Assets/Animations/Character/Character_SpriteSheets/newIdle.anim.meta
	Assets/Animations/Character/Character_SpriteSheets/newJump.anim
	Assets/Animations/Character/Character_SpriteSheets/punchOne.anim
	Assets/Animations/Character/Character_SpriteSheets/punchTwo.anim
	Assets/Animations/Character/Character_SpriteSheets/roll_0.controller
	Assets/Animations/Character/Character_SpriteSheets/walk_0.controller
	Assets/Animations/Enemies/EnemyOne/enemyOne_spritesheets/enemy1atk.anim
	Assets/Animations/Enemies/EnemyOne/enemyOne_spritesheets/enemy1die.anim
	Assets/Animations/Enemies/EnemyOne/enemyOne_spritesheets/enemy1run.anim

Assets/Animations/Enemies/EnemyOne/enemyOne_spritesheets/enemy_die.png.m
eta

Assets/Animations/Enemies/EnemyOne/enemyOne_spritesheets/enemy_run.png.m
eta

Assets/Animations/Enemies/EnemyOne/enemyOne_spritesheets/enemy_run_0.con
troller.meta
	Assets/Resources/placeholderEnemy.prefab
	Assets/Resources/placeholderEnemy.prefab.meta
	Assets/Scenes/SceneOneOld.unity
Rudimentary enemy AI

Fight