Updated docs
Merge branch 'master' of https://github.com/mako-framework/docs

Conflicts:
	02_routing_and_controllers/01_routing.md