added backup files ending in ~
Merge branch 'dev' of github.com:gbonnema/xmas into dev