commit before pull
Merge branch 'jamtimer-1.1' of github.com:sk8geek/jamtimer into jamtimer-1.1