commented out old handler mapping so '/' points to the new home page
Merge remote-tracking branch 'origin/master'

Conflicts:
	app_controller.py