style changes
Merge branch 'master' of https://github.com/McMenemy/ManualDataInput

Conflicts:
	ManualInput.py