Workspace
no message
Merge branch 'master' of github.com:NickQA/nicktestqa

Conflicts:
	.idea/workspace.xml