Workspace created.
Merge branch 'master' of https://github.com/mytmouse/CI-DEV.git

Conflicts:
	.gitignore