updates
Merge branch 'master' of https://github.com/drewherbst/HotelStalker

Conflicts:
	HotelStalker.xcodeproj/project.pbxproj