final version
Merge branch 'master' of https://github.com/dillondrenzek/prog-langs-final-project

Conflicts:
	bool_face.png
	faces.png