fixed cocoapods error
Merge branch 'master' of https://github.com/usrfrndly/BlackJack3

Conflicts:
	BlackJack3.xcodeproj/project.pbxproj
	BlackJack3/Main.storyboard
	BlackJack3/ViewController.swift