On same page
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/Cityzen
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/Cityzen
Added Dummy Login