Finished 1-6, only 7 left
Merge branch 'master' of https://github.com/jmera/biometrics-hmwk-2

Conflicts:
	README.md