Added a .gitignore.
Merge branch 'master' into production