From 8b2698cfa5359fc8193f60bf6f6ee27019dbc5cb Mon Sep 17 00:00:00 2001
From: tedjk <tedjohan@gmail.com>
Date: Thu, 14 May 2015 09:42:28 +0200
Subject: [PATCH 1/2] commit for merge

---
 juci/config.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/juci/config.cc b/juci/config.cc
index 22dbffb..0b9cd6a 100644
--- a/juci/config.cc
+++ b/juci/config.cc
@@ -4,6 +4,7 @@
 MainConfig::MainConfig() :
   keybindings_cfg_(), source_cfg_() {
   boost::property_tree::json_parser::read_json("config.json", cfg_);
+  
   GenerateSource();
   GenerateKeybindings();
   GenerateDirectoryFilter();
@@ -28,10 +29,8 @@ void MainConfig::GenerateKeybindings() {
   std::string line;
   std::ifstream menu_xml("menu.xml");
   if (menu_xml.is_open()) {
-    while (getline(menu_xml, line)) {
-      keybindings_cfg_.AppendXml(line);
-    }
-    
+    while (getline(menu_xml, line))
+      keybindings_cfg_.AppendXml(line);   
   }
   boost::property_tree::ptree keys_json = cfg_.get_child("keybindings");
   for (auto &i : keys_json)

From 242a2c6556bea1b9c2150d4a55069a1285ec4968 Mon Sep 17 00:00:00 2001
From: tedjk <tedjohan@gmail.com>
Date: Fri, 15 May 2015 09:44:51 +0200
Subject: [PATCH 2/2] some typo

---
 juci/notebook.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/juci/notebook.cc b/juci/notebook.cc
index cb3e159..407eb2c 100644
--- a/juci/notebook.cc
+++ b/juci/notebook.cc
@@ -25,7 +25,7 @@ Notebook::Controller::Controller(Gtk::Window* window, Keybindings::Controller& k
   ispopup = false;
   view().pack1(directories_.widget(), true, true);
   CreateKeybindings(keybindings);
-  INFO("Notebook Controller Sucsess");
+  INFO("Notebook Controller Success");
 }  // Constructor