Made emancipationfizzle into a basedent.
Merge branch 'master' of https://github.com/GoonHouse/Marin0SE