made teh change to fix bug#1
added a new class
Merge branch 'bugfixing1'
some changes to master
fix bug2
merging bugfix2
new stuff in main
further bug#2 fixing needed
merging main to bugfix2
minor fix
adding function bugfix2()
adding master code
some more code