Merge branch 'master' into queries
Semiworking schema
Fixed populating schema file.
Merge pull request #7 from kleyow/queries

Fixed populating schema file.
Merge remote-tracking branch 'origin/master' into queries
Merge pull request #6 from JonCooperWorks/queries

Queries
Merge remote-tracking branch 'upstream/master'

Conflicts:
	db.py
Rebased and fixed some errors.