updated .gitignore
fixed paths
Merge remote-tracking branch 'origin/master'