first client side commit
Merge branch 'master' of https://github.com/MayasHaddad/iri-l3-project