PC django set up
merge