First Sync Attempt
Merge branch 'master' of https://github.com/cbranch101/tornado_twins_entry

Conflicts:
	Assets/AITest.meta
	Assets/Built in Assets for FPS Control.meta
	Assets/ContestAssets/Scripts/EnemyAI.meta
	Assets/DelMe/E.meta
	Assets/FPSControlCore/RAIN/RAINDependentScripts.meta
	Assets/Objects/Competition Assets.meta