changes
Merge branch 'master' of https://github.com/koprty/BlogGroup5

Conflicts:
	testdb.py
merging