test
Merge branch 'master' of
https://github.com/lorddlazaro/MOBICOM-Anamnesia-Memoir.git

Conflicts:
	.gitignore