mocks for profile now working
com conflito

Merge branch 'master' of github.com:adelgado/website

Conflicts:
	app.js
	routes/.profile.js.swp