Merge branch 'master' into Stephen
Implemented 2 player, and basic gameplay

2nd players health is disabled to allow for testing
Merge branch 'Stephen'