Added basic Django project structure
Fixed conflict