Make types and expressions
Merge branch 'master' of https://github.com/Pieter2406/OGP_assignment