Finished Figure 2
Merge branch 'master' of https://github.com/camo1018/GTMRS

Conflicts:
	public/js/figure2.js
	server.js