Fixes
Merge branch 'master' of https://github.com/arshadansari27/fitranginew

Conflicts:
	app/config.py