Story 17
Fixed merge conflicts
Merge pull request #106 from buren/Story17

Story17
Story 18
Part Story 18
Merge pull request #107 from buren/Story_18

Story 18 delar, ej stöd för klasser
Task 15 completed