added some new files and fixed wrongly pulled files
upgrade
fixed conflict
Merge branch 'Django0505-master'
Merge branch 'master' of https://github.com/codex-academy/codeX_coders