initial commit
Merge branch 'master' of github.com:ajolicoe/cs111-asg3