Minor refactoring

Signed-off-by: Adam McNicol <adamsorders@mac.com>
Merge branch 'master' of https://github.com/MrAGi/COMP1-Pre-release-2013

Signed-off-by: Adam McNicol <adamsorders@mac.com>

Conflicts:
	2013 Unit 1 Skeleton Prgram for Python3.py