Småendringer i henhold til kartet
Merge branch 'master' of https://github.com/patricmj/HIOFCommuting.git
Conflict