added some code to make it a real script
Merge remote-tracking branch 'origin/master'

Conflicts:
	run.py