merges
change gitignore to ignore BASE, LOCAL, and REMOTE files