Merge branch 'master' of https://github.com/abesary/Global-App-Initiative-App-iOS

Conflicts:
.DS_Store