refactor
Merge branch 'master' of github.com:ArthurWu/fisher

Conflicts:
	web/app.py