Added gitignore.
Merge origin/master