updates
Merge branch 'master' of https://github.com/DaveLiu888/CBStuff

Conflicts:
	CBmaster/SNP/MySnippet.cbxml