added test1
added test2
added test3
added test4
removed 2
Revert "added test3"

This reverts commit 72c5d752127c1a91bce470744634e6f993d55400.
Merge branch 'rehistory'
Merge branch 'master' of https://github.com/Dr-Stavanger/testrepo