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

Task 15
Implementerade 16
Implementerade 16
Merge pull request #105 from buren/16

Implemented Story 16
Fixed merge conflicts