s
Merge branch 'master' of https://github.com/jquinn630/DrProf

Conflicts:
	NickyRage/NickyRage-csharp.sln
	NickyRage/NickyRage.sln