Merged "clean" branch into master branch

This repo turned into a mess during the Hackathon