Merge pull request #31 from rednaz/development

merging dev into evan-dev
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.
"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.
Conflict Resolution
Merge pull request #37 from rednaz/evan-dev

Evan dev