Tidy up and update to beta 3
Merge branch 'master' of github.com:thepatrick/Opentok-HelloWorld-Swift

Conflicts:
	HelloWorld/ViewController.swift