none
Merge branch 'master' of https://github.com/MadSciLabs/ofxWeatherBug

Conflicts:
	.DS_Store

example/ofxWeatherBug_example.xcodeproj/project.xcworkspace/xcuserdata/r
ui pereira.xcuserdatad/UserInterfaceState.xcuserstate