Update for Swift 1.1
Merge branch 'master' of https://github.com/mattwyskiel/Guitarparty-Cocoa

Conflicts:
	README.md