sync
Merge branch 'master' of https://github.com/oojhaa/digitalWaiter

Conflicts:
	digitalWaiter.xcodeproj/project.pbxproj