Edits... again
Merge branch 'master' of github.com:daltonwu/project-group7