dfdfdf
Merge branch 'master' of https://github.com/jrneulight/MidasTouch

Conflicts:
	MidasTouch/src/me/jrneulight/midastouch/Main.java