Merge pull request #5 from bsundman/master

merge

README.md

@@ -6,7 +6,6 @@ A Unity theme inspired by OSX Yosemite based on Ambiance.
 Changelog
 =========
 
-<<<<<<< HEAD
 February 21, 2015
 ----------------------
 Significant improvements in Metacity (Mate, Cinnamon, Gnome).  Added gnome-shell theme.
@@ -15,8 +14,6 @@ February 18, 2015
 ----------------------
 After many iterations, trials, and user votes, the near-final window controls have been set.  If you would like to keep the old controls, please stick with Yosembiance-0.6 branch.
 
-=======
->>>>>>> origin/master
 February 1, 2015
 ----------------------
 Tweaked window controls and borders, modified Unity launcher controls.