routes
Merge branch 'master' of https://github.com/vdclouis/dynomite

Conflicts:
	app/js/app.js