Merge pull request #33 from addisonbgross/master

Testing merge
Merge pull request #34 from addisonbgross/max

Merge pull request #33 from addisonbgross/master