Merge remote-tracking branch 'simon/master'
Merge https://github.com/simon0537090/Klick

Merging because of merging ;)
merging
gapfiller (unfinished)
gapfiller (yet unfinished)
gapfiller (yet unfinished)
Merge pull request #9 from sebsch/master

pull request