Merge branch 'UIShit'
Merge branch 'master' of https://github.com/cliq-cs196/ios