Implemented story 6, 100 points, yey
Implemented story 6, 100 points, yey
Merge pull request #110 from buren/16

16