Minor text improvment.
Fixed merge conflict.
Added .gitignore.