last Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	DataStructure/auth_test.js
	DataStructure/graph/graph.js