jfoster39/cs2340-team8 — pull request #28 by sjklein92 (2013-07-17 22:14:15+00:00)
Title: Tons of stuff for m4

Review additions below. Basically most of the stuff for m4.