Merging MainStoryBoard
Merge branch 'master' of https://github.com/leonson/practicum

Conflicts:
customer/PNC Mobile App.xcodeproj/project.pbxproj
customer/a/en.lproj/MainStoryboard.storyboard
conflicts

trying to overcome conflicts