merging requires commits
Merge branch 'master' of https://github.com/gadeweever/toufuu-project.git
Touch controlzzzzz and a few other things
Merge branch 'master' of https://github.com/gadeweever/toufuu-project.git