Initial commit
Merge branch 'master' of https://github.com/mauver/malaria_diagnosis_mfc

Conflicts:
	.gitignore