step 1 del tutorial
Merge branch 'master' of https://github.com/Qaysen/Ribbit-Django