b
Merge branch 'master' of https://github.com/LordImpetus/COMP1_2014

Conflicts:
	Skeleton Program.py