Merge branch 'master' of https://github.com/ericcd/CIT260section2.git