Remove .suo file
Merge branch 'master' of https://github.com/ProjectGig/GigServer

Conflicts:
	GigServer.v12.suo