login
Merge branch 'master' of https://github.com/gavinc88/linkedinHack2014

Conflicts:
website/public/index.html
Merge branch 'master' of https://github.com/gavinc88/linkedinHack2014