removed pending todos
code formatting
Added short description in head to test contribution to github!
Merge branch 'master' of https://github.com/JRossbach/clojure-ws1314