Work in progress
Work in progress
Added jasmine unit test framework
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/fgraph.js
	public/js/fgraph_json.js
Merge remote-tracking branch 'origin/master'