Everything works

Need to add some check expects
Merge branch 'master' of https://github.com/Corinrypkema/CS1102