stop it gitignore
Merge branch 'master' of https://github.com/wjys/Blockr