trying to fix
Merge branch 'master' of https://github.com/kingofraytown/BOAB

Conflicts:
	BoaB/Temp/UnityTempFile-3035d29f9fe414909a1ac88f18d6fb5e
	BoaB/Temp/__EditModeScene
Merge branch 'jjenkins'

Conflicts:
	BoaB/Temp/UnityTempFile-3035d29f9fe414909a1ac88f18d6fb5e
	BoaB/Temp/__EditModeScene
Touch areas and player animation

added touch areas on the right side of the game scene and made
animations for the player's attacks
Merge pull request #1 from kingofraytown/AnthonysBranch

Touch areas and player animation
Animator

Added animator component to touchmanager