Workspace created.
Changes made by Magdalena Testowa (testApp@yopmail.com).
Changes made by Magdalena Testowa (testApp@yopmail.com).
Merge branch 'master' of https://github.com/epts/EPTS.git

Conflicts:
	.gitignore