updated gitignore
Merge remote-tracking branch 'origin/master'
updated gitignore
minor clean-up / renaming