re-init
Merge branch 'master' of https://github.com/Aileenche/infused-earth-2