Implemented User Story X (issue #11)

Issue #11 is implemented
Updated the way I like it (issue #11)
Merge pull request #12 from srosemer/Implementing-Feature-X

Implemented User Story X (issue #11)