Merge branch 'docs'
Merge branch 'master' of github.com:pennappslabs/penn-mobile-server
Remove merge conflict