Workspace created.
Merge branch 'master' of https://github.com/anamsimon/SP-IM.git

Conflicts:
	.gitignore