updated 2b_res to work more as a utility script for 3b
Merge branch 'master' of https://github.com/pnutus/NHQM

Conflicts:
	nhqm/bases/gen_contour.py