cleanedUp

Cleaned up the spans and game title.
Merge branch 'master' of https://github.com/LemonMyth/TeamProject

Conflicts:
	.idea/workspace.xml