this should be committed
Merge pull request #1 from krlecarp/funnytest

this should be committed