blh
Merge remote-tracking branch 'origin/master'

Conflicts:

	build-assignment1-Desktop_Qt_5_3_MinGW_32bit-Debug/debug/assignment1.exe