ecmartz/ecmartz-hw2 — pull request #4 by theanomaly18 (2012-09-27 08:08:43+00:00)
Title: Fixed merging

Fixed branch merge. Ready for pull.

fox5....should refork the repo after this change is made, make his change, and send the pull request. I haven't worked too much with merging and pull requests. I think the other fix would have been to pull this into a new branch and then merge the new branch into the master branch. I'll read up on it and work with it for future assignments.