Add updated version of team 2's solution

I decided to finish working on our code the way that I envisioned in the dojo, but didn't have time to implement.
I added it as a separate file so that the original would persist, so that others could see what we actually got done in the span of the dojo.