joshthornton/COMP3301-A2 — pull request #1 by Vierware (2013-03-25 12:24:17+00:00)
Title: Update File to include both Authors (Josh King and Josh Thornton)

We both worked on it :)