#Indention problem
#Make some changes on your version and I think the program is working
Merge remote-tracking branch 'origin/master'

Conflicts:
	exercise2.py
	exercise3.py