Commit because git says so
Merge branch 'master' of github.com:georgio13/Imagine-Cup

Conflicts:
	IQGame/IQGame/IQGame.csproj
info in main menu
Merge branch 'master' of github.com:georgio13/Imagine-Cup

Conflicts:
	IQGame/IQGame/IQGame.csproj.Debug.cachefile
	WindowsGSM1/WindowsGSM1/WindowsGSM1.csproj.Debug.cachefile