Revert "Committing "thing""

This reverts commit 3b2a6c5b3f153f30f3223fb2292488d6f76669f9.
Modified thing; created thing2 and perl.pl
Modified perl.pl
Created master-file
Committing perl.pl, thing, & thing2
Created b1-file
Add line to master-file
Merge branch 'master' into b1
Add line to b1-file
Add line to master-file
New line in b1-file
Committing conflicted b1-file
Create conflict-file
Add new line to conflict-file in b1
Add new line to conflict-file in master
Committing merged conflict-file
Delete conflicts in conflict-file
Add new line to conflict-file in branch b1
Add new line to conflict-file in branch master
Conflict resolved in conflict-file