Conflict, prøver å commite bare src filer
Merge branch 'master' of https://github.com/patricmj/HIOFCommuting.git