prepping for turn in
Merge branch 'master' of github.com:jeremymwat/CS50-f2013
readying for turn in