devable mmkay
Merge branch 'devable'

Conflicts:
	scropt.py