Added complete weather function
Merged confilt solved