yahoo api
Merge branch 'master' of https://github.com/kgutteridge/HackaHotel

Conflicts:
	YahooHack/ViewControllers/HotelDetailViewController.m