init
Merge branch 'master' of https://github.com/xuneng/atom.git