whoops
typo
Merge branch 'master' of github.com:fhinson/santa into sabar
small
small
idk what i even changed
Merge branch 'master' of github.com:fhinson/santa into francis
qrcode js stuff
merge