Edit
std::map GetWeatherData();
to
std::map<std::string, double> GetWeatherData();
edit
bool DataChanged(std::string data, std::string oldData);
to
bool DataChanged(std::stringstream dataSstream,std::stringstream
oldDataSstream);
edit
std::string oldData;
to	
std::stringstream oldData;

edit
int ParseSFileData(std::stringstream dataSstream);

to
int ParseSstreamData(std::stringstream dataSstream);

added

void WeatherDataModel::Update()

addet
	std::map<std::string, double> GetWeatherData();
fixed syntax error
Update Model.cpp
Update Model.cpp
...
after using merge tool
conflicts
conclicts solved
Merge branch 'master' into marius

Conflicts:
	src/WeatherDataModel.cpp
	src/WeatherDataModel.hpp