added something else that's useless
Merge pull request #1 from marc-hanheide/master

Added fancy new file that will change the world. this is good
test message