Merge pull request #31 from rednaz/development

merging dev into evan-dev
Being Damaged implemented

Also standing HP and standing HK implemented
Merge pull request #35 from rednaz/development

Merging fixed project into evan-test
Begin testing UI with player variables

Slightly modified the player controller scripts to use both health and
maximum health variables for ease of development.

Strangely, C Player is having max health issues. This will be addressed
in a later commit.
Merge branch 'chico-dev' of https://github.com/rednaz/csuci-capstone into chico-dev

Conflicts:
	unity-project/Library/assetDatabase3
	unity-project/Library/guidmapper
	unity-project/Library/metadata/04/0402607bb9ce3a4478d4efc2b29f7947
	unity-project/Library/metadata/37/37c3d09528577f44f8db096c229b9e0b
	unity-project/Library/metadata/43/4397106024ca62840b6bfa901bcc4d71
	unity-project/Library/metadata/7e/7e60a0b2372b9064fb326e5c337e6a7b
	unity-project/Library/metadata/d1/d1d84fdbd0f639d408ce77e17a082b24
	unity-project/unity-project.userprefs
"KO/Time Over" implemented, health UI modified

GUI displaying either KO or "Time Over" messages has been implemented.

Modified health-related GUI to directly use PlayerController health
variables instead of saving their values locally. Slightly modified
Player Controller by adding maxHealth variable, setting its value, and
then setting the normal "health" variable to maxHealth.
Crouching HP works

Along with animation put in
Freeze code works
added comments
handling conflicts
Merge pull request #36 from rednaz/chico-dev

Chico dev
Conflict Resolution
Merge pull request #37 from rednaz/evan-dev

Evan dev
conflict resolution