Initial commit
Merge https://github.com/PereBal/Progr_Conc