some edits, added gitignore
merged with Chris's gitignore