Project upload
Merge branch 'master' of github.com:tp-team-14/Smog-mobileapp