setting up all files
Merge branch 'master' of https://github.com/steven-king/project1_teaching