unity Title Bar Icons added

.gitignore

@@ -1,2 +1,2 @@
+# Ignore Backup Copies from Text Editor
 *~
-

TODO

@@ -1,3 +1,6 @@
+DEPRECATED
+lets use Issues instead
+
 Graphical assets - the current ones are fat and round. We must avoid round (for everything but radios) and fat. They have to be with very think square border (or REALLY super tiny rounded one). Also - we miss assets for anything, but GTK 3.
 
 GTK 2 theme progress - there isn't one. Not gonna even bother to describe what's left to do there.
@@ -10,3 +13,5 @@ GTK 3 theme:
  - [won't fix] Inline toolbar has that huge grey border over it that needs exterminating. The joined buttons in it should look like the ones Google uses
  - [done] Our srollbars are SUPER SEXY (legacy and overlay - both). Or in British - I am quite found of the look of how the scrolling widgets look.
  - <add more here>
+
+

gtk-3.0/apps/granite-widgets.css

@@ -176,13 +176,10 @@ GraniteWidgetsPopOver {
 
 .popover_bg {
     background-color: transparent;
-<<<<<<< HEAD
     background-image: none;
     background-color: @menu_bg_color;
-=======
     background-color: @menu_bg_color;
     background-image: none;
->>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
 }
 
 GraniteWidgetsPopOver .sidebar.view,
@@ -205,13 +202,8 @@ GraniteWidgetsPopOver .button:hover:active {
 }
 
 GraniteWidgetsPopOver .entry {
-<<<<<<< HEAD
     background-image: none;
     background-color: @theme_base_color;
-=======
-    background-color: @theme_base_color;
-    background-image: none;
->>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
     color: @theme_text_color;
 }
 
@@ -223,13 +215,8 @@ GraniteWidgetsPopOver .entry {
 .app:hover,
 .app:focus {
     border-color: shade(@theme_selected_bg_color, 0.90);
-<<<<<<< HEAD
-    background-image: none;
-    background-color: @theme_selected_bg_color;
-=======
     background-color: @theme_selected_bg_color;
     background-image: none;
->>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
     color: @theme_selected_fg_color;
 }