We gonna git it working
mergeMerge branch 'master' of https://github.com/mfliu/cs4720MobileProject