Removed Nik's stupid comment
Jake branch commit
Merge branch 'master' into Jake

Conflicts:
	RaikesSimplexService/DataModel/Solution.cs
Cleanup them files plz
Forgot one
Merge pull request #2 from jaysanatez/Jake

Jake