added catalogue
Merge branch 'route-change'

Conflicts:
	cors-data/index.js
	public/javascripts/catalogue-controller.js
	routes/index.js
	views/catalogue.jade
	views/nav.jade