initial committ of django
merge conflics resolved