test sync
Merge branch 'master' of github.com:tMaxx/SpaceGuess

Conflicts:
	Visual/Class/History.cs
	Visual/Class/HistoryItem.cs
	Visual/Program.cs
	Visual/Roadmap.txt