first pass
Merge branch 'master' of https://github.com/kreed80/pset1

git commit-m 'must pull before push'
git push origin master