changes commited
gitignore changed
Merge remote-tracking branch 'origin/master'