Test commit (broken)
Fix crash on startup and crash on button click
Merge remote-tracking branch 'origin/master' into Jordi
Merge remote-tracking branch 'origin/master' into Jordi
Merge remote-tracking branch 'origin/master' into Jordi
Merge remote-tracking branch 'origin/master' into Jordi
Merge pull request #9 from rightfold/Jordi

Jordi