damnit
Merge remote-tracking branch 'origin/master'

Conflicts:
	chemX/chemInterpreter/static/chemInterpreter/js/custom.js
	chemX/chemInterpreter/templates/chemInterpreter/index.html
	chemX/chemInterpreter/views.pyc