made the series of if statements more efficient with a for loop instead
Merge remote-tracking branch 'origin/master'

Conflicts:
	exercise1.py