again rectified
Merge branch 'master' of https://github.com/osdc/graphHack

Conflicts:
	main.js