merging
Merge branch 'master' of https://github.com/terrydif/NoodleGents

Conflicts:
	NoodleGents.userprefs
Merge branch 'master' of https://github.com/terrydif/NoodleGents
removed unneeded files from tracking