add gitignore
fix formatting and typo.
Merge remote-tracking branch 'origin/master'