Module.
Merge pull request #3 from jared-bridg/vasanth_working_on_something

Module.
Added something interesting
Fixed the conflict that wasn't really a confict