Adapted
Fixed conflicts
Merge branch 'master' of https://github.com/mikand/epb-lab
Commit for LaSilvia