From 4ed77f3032e011e9dbcc65b91a3471458a7c5c8e Mon Sep 17 00:00:00 2001
From: Brad <brad@brad-XPS13-9333.(none)>
Date: Wed, 23 Apr 2014 19:36:37 -0700
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'