Merge branch 'master' of https://github.com/mattdonders/pebble-holida… … 

…yish
latest commit 735e78931c
@mattdonders authored