work
Merge branch 'master' of github.com:weshack/WesPlan

Conflicts:
	db/db.py
	server.py