Merge pull request #1 from purplecabbage/Catchup master
authorJesse MacFadyen <purplecabbage@gmail.com>
Thu, 4 Jan 2018 22:30:13 +0000 (14:30 -0800)
committerGitHub <noreply@github.com>
Thu, 4 Jan 2018 22:30:13 +0000 (14:30 -0800)
Electron as a first class citizen


Trivial merge