adowns01/Griffins — pull request #6 by adowns01 (2014-06-13 21:52:44+00:00)
Title: Comined errything

we combined everything