fix
Merge branch 'master' of https://github.com/shainen/nb

Conflicts:
	data/su2S3t20j0.01r100.lst
fix
fix