pointless commit
Merge remote-tracking branch 'team/master'
meaningless commit to update
syncing my branch
Stage updated

Broke the stage's methods into smaller submethods.
Updated Stage & Combat Page

Added animations to Stage & cleaned up CombatPage to use the Stage
class.
Updated Stage & Combat Page

Added animations to Stage & cleaned up CombatPage to use the Stage
class.

Devin: Fixed a bunch of things including a bad merge, typos, and null pointer exceptions.
Merge remote-tracking branch 'pat/master' into pullrequest

Conflicts:
	immunity/Assets/Scripts/Combat/CombatPage.cs
	immunity/Assets/Scripts/Stage.cs