merger
Merge branch 'master' of https://github.com/eirikurorri/lucifer
merger
FPS meter added, and an attempt for background reset