Done Thurs Morning
Done Thurs Morning
Merge remote-tracking branch 'origin/master'

Conflicts:
	g2.html
	scripts/graphMgr2.js
Pushed 11/25/14 Tues Morning