running django app
merged forked repo to master
fixed conflicts and changed some stuffsss