no message
123
Merge remote-tracking branch 'github/master'

Conflicts:
	.idea/workspace.xml
	out/production/Waggr/CitiesParserYandex.class
	out/production/Waggr/Main.class
	out/production/Waggr/Weather.class
	out/production/Waggr/WeatherParserYandex.class
	src/Main.java