Synch with laptop
Merge branch 'master' of https://github.com/SalamanderMike/gifter
Synch with laptop