garbage
Merge branch 'master' of https://github.com/edulun/BaLuGa

Conflicts:
	Sample/cse141-lab/Lab3.qws