THOMAS LI IS AN ASSHOLE
Merge branch 'master' of https://github.com/tsztoyip/SDGTempQ

Conflicts:
	templete from NSSCHOICES.php