makefile
Merge branch 'master' of https://github.com/Marssol/Lenka_Lina
Merge branch 'master' of https://github.com/Marssol/Lenka_Lina