Merge branch 'master' of https://github.com/sjkdenny/JunctionLibrary

Conflicts:
	create_library.pyc
	globalvars.pyc
	hjh/junction.pyc
	threeBythree.py