Updating makefile with better commits and branches. Also adding .gitignore