moved files
Merge branch 'master' of https://github.com/raylee247/cs304