4.0

Major program overhaul
Merge remote-tracking branch 'origin/master'

Conflicts:
	runme.sh