Altered docstrings, TypeError and ValueError, Step 4
Took out Example $python accidentally
Merge branch 'master' of https://github.com/ShuaiW/inf1340_2014_asst1

Conflicts:
	exercise1.py