From: Joshua Colbeck <Skrymir@users.noreply.github.com>
Date: Thu, 21 Jul 2016 02:56:44 +0000 (-0500)
Subject: Merge pull request #3 from jackhumbert/master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=03840a8c4d6b8083b8e4e23ae083608769406735;p=qmk_firmware.git

Merge pull request #3 from jackhumbert/master

pulling in remote changes
---

03840a8c4d6b8083b8e4e23ae083608769406735