ena pa
Merge branch 'master' of https://github.com/EdFil/QS

Conflicts:
	Proj2/QS/Rest.mch