quicksand update
Merge branch 'dev' of https://github.com/athurman/holidayko into dev