add .gitignore
merge master w/ wip