cjord01/qaware — pull request #37 by rickydo (2014-09-29 00:58:39+00:00)
Title: Merge conflict

fixed it