honk
fixed merge conflict honk wah
fixing honk wah conflic
Merge pull request #6 from TBroedsgaard/testing

Testing