first commit
test project
Merge https://github.com/cWalters2/cmpt275project