Added catapult
Merge branch 'master' of https://github.com/orablu/eecs290-pr3

Conflicts:
	Assets/Resources/Archer.prefab
Added flamer