Added name and email
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_exercise1.py