Configure git ignore
Merge branch 'master' of https://github.com/Teache/speymedical

Conflicts:
	.idea/workspace.xml