-added history to the server
Merge branch 'master' of github.com:spember/fluentconf2013-hacks