did some stuff
fixed header merge conflict
Merge branch 'master' of https://github.com/katke/mano