Partial commit
Implemented story 15
Fixed Marge conflicts
Merge pull request #104 from buren/task_15

Task 15