From: Adam A. G. Shamblin <adam.shamblin@gmail.com>
Date: Wed, 22 Jan 2014 15:42:37 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/coyote240/resume
X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=b1e4dec5dc30fb35a7560217e6295317bf5b5ffb;p=resume.git

Merge branch 'master' of https://github.com/coyote240/resume
---

b1e4dec5dc30fb35a7560217e6295317bf5b5ffb