Merge branch 'Carlos1' into merge_branch

Conflicts:
the_weather_vain/Main.storyboard
the_weather_vain/Podfile
the_weather_vain/WeatherVain.xcodeproj/project.pbxproj
the_weather_vain/WeatherVain/AppDelegate.m
Merges Carlos1 to this branch