more columns
Merge branch 'master' of github.com:rolandshoemaker/PyPiAP

Conflicts:
	ap/db.py
asd