Merge remote-tracking branch 'origin/master'

Conflicts:
	assignment1/assignment1.pro