update

update
Merge branch 'master' of https://github.com/Tiritium/Tektiles

Conflicts:
	.DS_Store
	templates/store/checkout.html
	templates/store/shop-homepage.html
	userdb.sqlite3