GoonHouse/Marin0 — pull request #1 by EntranceJew (2014-10-02 18:54:38+00:00)
Title: Implementing Hammy's Changes

Bringing the group repo up to speed with Hammy before transferring him to the group repo.