Parser
Merge branch 'master' of https://github.com/DAT210-Gr-E/Server