latest changes
Merge branch 'master' of https://github.com/tehwallz/sosafe

Conflicts:
	sosafe/src/org/karg359/gui/Run.java