I did a few updates so I had to change the image
Merge branch 'master' of https://github.com/watdafek/Facemash

Conflicts:
	.DS_Store