Updated gitignore and fixed makefile