updated gitignore and makefile and finished 22