first commit
Merge branch 'master' of github.com:StephenCWan/cs50x-2012