Add conflict
Remove "different"
Merge remote-tracking branch 'origin/master'

Conflicts:
	lesson_3_reflections.txt