Stuff no one needs
Merge branch 'master' of https://github.com/DeonHua/SEHackDay

Conflicts:
	logic.py
More molar mass changes