just trying to pull again...
Merge branch 'master' of https://github.com/jremmons/auto_assignment_nmr

Conflicts:
	search_project/Node.pyc
	search_project/Tile.pyc
	search_project/search_strategies.pyc
Merge branch 'master' of https://github.com/jremmons/auto_assignment_nmr
this still isn't working
characteristic