init
Merge branch 'master' of github.com:dawnsong/fmri.etc