Completed the second programming exercise
Merge branch 'master' of https://github.com/syqnew/ProgrammingExercises

Conflicts:
	ProgrammingExercise1.py