From: Ben Beltran Date: Thu, 6 Aug 2015 15:20:02 +0000 (-0500) Subject: Merge branch 'master' of bitbucket.org:benbeltran/n-s-o-vocal X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/commitdiff_plain/78bae1f1f9a369c6b0c2ba934063d70866c79b74 Merge branch 'master' of bitbucket.org:benbeltran/n-s-o-vocal Conflicts: jekyll/about.html jekyll/projects.html --- 78bae1f1f9a369c6b0c2ba934063d70866c79b74