Merge pull request #6 from jared-bridg/jared

Jared
Fixed merge
meh3
Example merge