r
Merge branch 'master' of https://github.com/alyssialui/NCMS

Conflicts:
	TEST.txt