rijesenje konflikta
c
Merge branch 'master' of https://github.com/C2V3N/termin.git
Merge branch 'master' of https://github.com/C2V3N/termin.git
Merge branch 'master' of https://github.com/C2V3N/termin.git
Commit and push by ivan