Update- almost over
Merge branch 'master' of https://github.com/hacktm/Smart-City-Projects-Echipa.git