Amy made change
Amy made change again
Merge remote-tracking branch 'origin/master'

Conflicts:
	lesson-3-exercises.md