removing log/development
fixing conflict
Merge branch 'master' of github.com:olivierrg/itsy