deleted everything that was in the fucked up master branch
merged skanner-sephia2 and master
Revert "merged skanner-sephia2 and master"

This reverts commit a61ba526e9d80bea226ed78f546263f8a9869f99, reversing
changes made to 9aeb5113cc3fe25324f1504dae3bf9d3e4931529.
one last thing to trash in amster
fuckign up a merge?