Adding local .cache for merging
Merge remote-tracking branch 'origin/master' into story-5

Conflicts:
	.cache
Completed story 5, added user name to game experience
Merge pull request #1 from DeepSky8/story-5

Story 5
Merge remote-tracking branch 'origin/sprint-1' into fix-merge-conflicts

Conflicts:
	src/moonbase/Game.scala