123
1232
Merge branch 'master' of https://github.com/defrid/WeatherInfo

Conflicts:
	WeatherInfo/MainWindow.xaml.cs