rcsimm/helios — pull request #1 by sebastianconcept (2014-11-02 19:33:29+00:00)
Title: Fixing ryan feature

merge conflic fixing session on this feature
Ryan & Seb pairing on it