guanaprint upload
Merge branch 'master' of github.com:alons182/guanaprint