Changed folder names
Merge branch 'master' of https://github.com/andylamb/cs147-project-2