Test commit
Merge branch 'master' of https://github.com/anoopjohn-dev/GAE_EXPERIMENTS

Conflicts:
	django-guestbook/urls.py