Maybe this will work?....
Merge branch 'master' of https://github.com/Ungepirater/Router

Conflicts:
	app.js