1st commit
Merge branch 'master' of https://github.com/gheidorn/oak-medical

Conflicts:
	.gitignore