tada
Merge branch 'master' of github.com:ksmonkey123/ModJam

Conflicts:
	trektech/ch/awae/trektech/Properties.java