Actually resolved merge conflicts.
Merge branch 'master' of github.com:Malent3218/entropy-prototype