Testing

Uselesss Commits to Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	exercise1.py
Updated documentation and copyright
Minor comments
Edited Exercise 3 to include a dictionary