Initial commit of hotcoffee
Merge branch 'master' of https://github.com/p3dr0migue1/dev