Azix/azix — pull request #49 by wcjohnson11 (2014-07-25 20:00:25+00:00)
Title: Revert "Merging from wcjohnson11/dev-three"

Reverts Azix/azix#48