uncommit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/web/js/util/bar_graph.js
Merge branch 'master' of https://github.com/UKCHackMizzou2014/Global-Hack-III-Project