testing conflict
Merge branch 'master' of https://github.com/vbarua/QDG-Lab-Framework

Conflicts:
	Client/PATClient.py