Merge pull request #105 from buren/16

Implemented Story 16
Implemented story 6, 100 points, yey