we need to add these to git ignore
Merge branch 'master' of https://github.com/hollylowe/pebble-authenticator

Conflicts:

PebbleAuthenticator.xcodeproj/project.xcworkspace/xcshareddata/PebbleAut
henticator.xccheckout