Merge branch 'master' of https://github.com/pluto-/Faces

Conflicts:
	src/Faces.java
	src/Perceptron.java