Merge branch 'local'

Conflicts:
.gitignore
TTChallenger/Base.lproj/Main.storyboard