VERY ROUGH COPY OF CRUSHER
Merge branch 'master' of https://github.com/BryanTai/cs312project1.git

Conflicts:
	crusher.hs

Signed-off-by: Linh Phan <Linh@dhcp-206-87-112-206.ubcsecure.wireless.ubc.ca>