task 10
Merge branch 'master' of https://github.com/jbuendia19/COMP1_2014

Conflicts:
	Skeleton Program.py