unwanted changes

unwanted changes
Merge branch 'master' of https://github.com/chhernandez/CodeKite

Conflicts:
	WeatherDemo/WeatherDemo/cdkViewController.m