Updates
Merge branch 'master' of github.com:RoboPython/George2

Conflicts:
	george/flaskr/app.py