byuphamerator/phamerator-dev — pull request #18 by byuphamerator (2014-08-26 20:37:25+00:00)
Title: Iss4

Merging changes to master