Combine goal and airquality.
Merge branch 'develop' of https://github.com/anandsaw/Reactive-AirQuality into develop

Conflicts:
	Reactive-AirQuality/src/main/java/nl/tudelft/in4389/main/App.java