no message
Merge branch 'master' of https://github.com/semler/Werewolf

Conflicts:
	Werewolf.xcodeproj/project.pbxproj
	Werewolf.xcodeproj/project.xcworkspace/xcuserdata/semler.xcuserdatad/UserInterfaceState.xcuserstate