Added something interesting
Added something interesting
Fixed the conflict that wasn't really a confict
Merge pull request #4 from jared-bridg/jared_working_on_something

Jared working on something