Merged Elliot's branch with Mark's branch

Combined the multi-client and player input features.