about to merge
add gitignore