:wq wq Merge branch 'master' of https://github.com/alok-sm/PennAppsW17
:wq
wq
Merge branch 'master' of https://github.com/alok-sm/PennAppsW17

alok-sm/PennAppsW17,alok-sm/PennAppsW17,alok-sm/PennAppsW17,alok-sm/PennAppsW17