clean up
Merge branch 'master' of https://github.com/patricelliG/java_sys_script

Conflicts:
	mac_master.py