Merge branch 'swift4'

# Conflicts:
#	Macaw.podspec

Author: vhailor13

.gitignore

@@ -22,3 +22,4 @@ contents.xcworkspacedata
 .DS_Store
 .Macaw.podspec.swp
 .Package.swift.swp
+Podfile.lock

.swift-version

@@ -1,2 +1,2 @@
-3.0
+4.0
 

.travis.yml

@@ -1,9 +1,9 @@
 language: objective-c
-osx_image: xcode8.1
+osx_image: xcode9
 
 branches:
     only:
     - master
 
 script:
-  set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' | xcpretty;
+  set -o pipefail && xcodebuild test -project Macaw.xcodeproj -scheme 'Macaw iOS' -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 6,OS=11.0' | xcpretty;