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

Conflicts:
	src/Faces.java