First Commit for issue53
first commit for hotfix
Merge branch 'issue53'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/hoang/AllMyCode
adding my django application