Route Skeleton
Merge branch 'master' of https://github.com/patrickrb/chausages

Conflicts:
	app/scripts/controllers/main.js
	app/scripts/services/socket.js