fun
Merge branch 'master' of https://github.com/thetic/LabA

Conflicts:
	Part3/Part3.qws