change flask values
Merge branch 'master' of github.com:vamf12/FlaskEx

Conflicts:
	setup.py