Some changes made
Merge branch 'master' of https://github.com/BrockVCNLab/faces

Conflicts:
	faces.py
Some more changes