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

Conflicts:
	pset3/fifteen/log.txt

	modified:   pset3/fifteen/fifteen.c
modified:   pset3/fifteen/log.txt
Correction to init and draw
does not work...cant get it worked, fuck** up prog in fact i think