Sprint5 almost done. Testing added :)
Merge branch 'master' of https://github.com/dohnto/DigitalLighter