displaying token
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/Cityzen
testing social login
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/Cityzen