first commit
OMerge branch 'master' of https://github.com/maxdidato/hackathon