unknown changes

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

Conflicts:

WeatherDemo/WeatherDemo.xcodeproj/project.xcworkspace/xcuserdata/mirea.x
cuserdatad/UserInterfaceState.xcuserstate