Merge branch 'master' of https://github.com/amykwan/inf1340_2014_asst1

Conflicts:
	exercise1.py