added weather, still need to fix weather and use html inheritance
Merge branch 'master' of https://github.com/RabeeHanna/Project

Merged to avoid error.