?
Merge branch 'master' of https://github.com/woodenchopsticks/Pennapps

Conflicts:
	chemX/chemInterpreter/views.pyc