Light part completed
Merge branch 'master' of https://github.com/medrimonia/MASProject