first commit
Merge branch 'master' of https://github.com/bbramble/838mini_project