Fixed *GG*
Merge branch 'zebra' of https://github.com/christianlykke9/Zebra into zebra
Added the Test class + fixed MainActivity