initial commit of django app
merge