added on master for the second time

added something to the jake branch

this is the third time

the test server

no conflicts here

this is the one to watch

added a line to master, this should appear second in the log

no merge commit when I rebase the master