40.1 V2 Combined properly and feedback fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assinments/Pebj_Smot_AS.40.1_V2/Assignment40.1.v12.suo
Merge branch 'master' of https://github.com/Rabka/BDSA2014