I Did stuff
Merge branch 'master' of http://github.com/hsad/cocaine