Working on makefile, modified gitignore