dumb Stuff
Merge branch 'master' of http://github.com/hsad/cocaine
sorry fixed the merc error
Merge branch 'master' of https://github.com/Hsad/Cocaine
Merge branch 'master' of http://github.com/hsad/cocaine
Merge branch 'master' of https://github.com/Hsad/Cocaine into ben