First commit
Merge branch 'master' of https://github.com/kr85/CS157BTeamProject