Added gitignore
Merge branch 'master' into master-and-slave