modified:   pset3/fifteen/log.txt
Merge branch 'master' of https://github.com/mayweed/cs50

Conflicts:
	pset3/fifteen/log.txt
won() really does not work...