her
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assinments/Pebj_Smot_AS.40.1_V2/Assignment40.1.v12.suo