pulling updates from master
update .gitignore