change views
Merge branch 'master' of https://github.com/cjameszhang/cs411

Conflicts:
	hello/views.py
test heroku
add db
start mysql