asdf
asdf
Merge branch 'master' of github.com:jrcbriggs/srgp

Conflicts:
	SRGP/register/register2nb.py
Merge branch 'master' of git@github.com:jrcbriggs/srgp.git
renamed nbapi.py to uploader .py and its test