from doms 2
Merge branch 'master' of https://github.com/TeamPura/Mini_Project_2.git

Conflicts:
	src/test/resources/testGit.config