Nssf fixes

The problem with git jokes is that everyone has a different version.
Merge branch 'master' of https://github.com/GreenSpider/Google

Conflicts:
	SchoolCup/SchoolCup.v11.suo