Revert "Merge branch 'master' of https://github.com/ndomar/megasoft-13"

This reverts commit 5f69a7c993f24462d59b92fc7be4298dcee633fd, reversing
changes made to 062c226fb0ceb0fcfec1ea2e7304fe48da0b9798.