Updated gitignore and makefile