Added makefile and made some changes to lab2