fixed things yoyoyoyoy
Merge branch 'master' of https://github.com/a16zTX2014/iOS