Trying out some test cases
Added other tests
Merge branch 'master' of https://github.com/tariqjav/inf1340_2014_asst1

Conflicts:
	exercise2.py