Added .gitignore to root, correct utf-8 error
Merge remote-tracking branch 'origin/master'