rename potentially conflicting files
Rename files
Lesson 7 material
Merge branch 'master' of github.com:benaskins/BEWDiful_Students