merge in master's gitignore
merge master's makefile