redirect to maggie
Merge branch 'master' of https://github.com/gavinc88/linkedinHack2014

Conflicts:
	website/public/test.js
Maggie map
Merge branch 'master' of https://github.com/gavinc88/linkedinHack2014

Conflicts:
	website/public/index.html
	website/public/test.js