Added a new WeatherService.java
first commit of upgrade-grails branch with a.txt, b.txt
Added c and d text files and edited WeatherService
Merging upgrade-grails with master
Merge branch 'upgrade-grails'
edited config.php with password and user
Whoops, new password in config.php, back in master branch
Edited config.php to remove bootsy password and fix conflict