Commiting changes to kjetils-branche

Adding one txt file and one binary
Committing conflict-starting change
Revert "Committing conflict-starting change"

This reverts commit 2379538b950344d458109a32d56bc39df66c15b7.
Merge pull request #3 from EDRMedeso/Kjetils-branch

Kjetils branch