ios presentaiton
Merge branch 'master' of github.com:floored/floored.github.com