How does
Removed Nik's stupid comment
Jake practicecommit
Jake branch commit
Merge pull request #1 from jaysanatez/Swamp_Donkey

How does
Merge branch 'master' into Jake

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

Jake
Merge branch 'master' into Rachel