modified makefile, added .gitignore, formatting