Test
ok
Merge branch 'master' of https://www.github.com/Bastosss77/GEB_project

Conflicts:
	.gitignore
	README.md
Merge branch 'master' of https://www.github.com/Bastosss77/GEB_project

Conflicts:
	.gitignore
	README.md