YAY MYSTERY!
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	source/SImystery.java
	source/SIpanel.java