Failed to fix bug
Merge branch 'master' of https://github.com/AllanYangZhou/decision-app

* 'master' of https://github.com/AllanYangZhou/decision-app:
  blah

Conflicts:
	server.py