help
a
remove code
Merge branch 'master' of https://github.com/cjameszhang/cs411

Conflicts:
	hello/db.py
	hello/views.py