Delete hello.py
add usr/bin/env
add coding:utf-8
merge & fix conflict
add #