removed old files that somehow survived my rage
Merge branch 'master' into bachelor