initial commit
Merge branch 'master' of github.com:ajolicoe/CMPS183_Homework3