add the app router
Merge branch 'master' of https://github.com/sunniejai/black-sesame

Conflicts:
	Server/public/javascripts/main.js
	Server/public/javascripts/router/AppRouter.js