Returned to int in weather.java
Merge branch 'asier'