final
Merge branch 'master' of https://github.com/jsl15/viceralColorProject

Conflicts:
	public/javascript.js