changed path
Merge branch 'master' of https://github.com/jennli/CPSC410_Group15.git