pset 1
Merge branch 'master' of https://github.com/jeremymwat/cs50-f2012

merging