added /usr/bin/env
add coding: utf-8
merge & fix test.txt
Added o.gitignore and an ignored file
added gitignore
added .gitignore, deleted some useless files
Merge remote-tracking branch 'origin/master' into dev
Merge branch 'dev'