Local changes to hell
Merge branch 'master' of https://github.com/swaroopjayanthi9/django-sample

Conflicts:
	Hello.py

Merging the changes: