playing with a template
Merge branch 'master' of https://github.com/ebuyukcan/WiserWater

Conflicts:
	djangoproject/dev.db
Merge branch 'master' of https://github.com/ebuyukcan/WiserWater