1st Upgrade
Merge branch 'master' of https://github.com/jpelczar/pi_desktop