Fix router so that we can have as many routes as we want.
Merge branch 'master' of github.com:tombert256/frameworkeyPromiseEdition

Conflicts:
	config/routes.js