New function
Merge branch 'master' of https://github.com/pyindex/learning

Conflicts:
	db.sqlite3