Added gitignore
Merging.
Merging
Merge remote-tracking branch 'origin/master'