pset2
pset2 and pset1 changes
Merge branch 'master' of github.com:jeremymwat/CS50-f2013

Conflicts:
	pset1/credit.c
	pset1/mario.c