init
Merge branch 'master' of https://github.com/zarknight/mylife.git