Matching animations on witch to charcontroller

Up and Down work. Needs lean left/right.
Barrel rotates.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/UI Assets.meta
	Assets/UI Assets/Build Screen.meta
	Assets/UI Assets/Build Screen/build_prompt.png.meta
	Assets/UI Assets/Build Screen/icon_hover.png.meta
	Assets/UI Assets/Build Screen/icon_pressed.png.meta
	Assets/UI Assets/Build Screen/icon_unpressed.png.meta
	Assets/UI Assets/Build Screen/sell_button.png.meta
	Assets/UI Assets/Build Screen/skip_button.png.meta
	Assets/UI Assets/Build Screen/tooltip_background.png.meta
	Assets/UI Assets/Combat Screen.meta
	Assets/UI Assets/Combat Screen/color_sample.png.meta
	Assets/UI Assets/Combat Screen/cursor.png.meta
	Assets/UI Assets/Combat Screen/hp_frame.png.meta
	Assets/UI Assets/Combat Screen/money_display.png.meta
	Assets/UI Assets/Combat Screen/timer_frame.png.meta
	Assets/UI Assets/Game Over.meta
	Assets/UI Assets/Game Over/game_over.png.meta
	Assets/UI Assets/Game Over/mainmenu_button.png.meta
	Assets/UI Assets/Title Page.meta
	Assets/UI Assets/Title Page/instructions.png.meta
	Assets/UI Assets/Title Page/quit_button.png.meta
	Assets/UI Assets/Title Page/start_button.png.meta
	Assets/UI Assets/Title Page/title_background.png.meta

Signed-off-by: caidavid <davidcai@umich.edu>
oops accidentally deleted gitignore. Adding back in