Merge branch 'git-ignore'
Adding Travis-CI Config.
Adding XCWorkspacedata file for Travis
Adding xcode_scheme
Adding a shared scheme
Fix merge conflicts