Empty django project
Merge branch 'master' of github.com:caujka/TripJournal