Use git flow

[emileber]

Now that the Hackathon is over, we should add a develop branch and start using git flow.