GUI
Merge branch 'master' of https://github.com/Fattouh92/src into noha
write and commit DONE!
Units
Merge branch 'noha' of https://github.com/Fattouh92/src into omar
incomplete
writing and commiting adjusted