merged
erge branch 'master' of https://github.com/DDionne/iOS-Hello-World