Changes for Lab 2: annotated type checker, renamed types and functions in Environment.hs
Resolved merge conflict in Makefile