Strange merge conflict
Merge branch 'master' of github.com:mrgnw/djangular-seed2