with Django 1.6 tutorial
Merge branch 'master' of https://github.com/mfarinelli/abca