First commit. Markers added
Merge branch 'master' of https://github.com/valner/diplom