diff --git a/Microcontrollers/Microcontrollers.atsln b/Microcontrollers/Microcontrollers.atsln
index 32d8297..4f87f2e 100644
--- a/Microcontrollers/Microcontrollers.atsln
+++ b/Microcontrollers/Microcontrollers.atsln
@@ -21,9 +21,17 @@ Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 2.3", "opdracht 2.
 EndProject
 Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 2.5", "opdracht 2.5\opdracht 2.5.cproj", "{C81B68AA-F4BB-4A5D-81F8-2737DCD1D4A7}"
 EndProject
+<<<<<<< Updated upstream
 Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "testlcd", "testlcd\testlcd.cproj", "{B964892D-A92F-44D4-AF99-3ADC61820917}"
 EndProject
 Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 3.2", "opdracht 3.2\opdracht 3.2.cproj", "{EB7415C6-2130-46AD-9842-612C67ADE6D4}"
+=======
+Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 2.4", "opdracht 2.4\opdracht 2.4.cproj", "{0FA0C637-5AC0-44F3-999B-49C114B97183}"
+EndProject
+Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 3.3", "opdracht 3.3\opdracht 3.3.cproj", "{985D5C75-F61E-49F1-A532-66A1E6141552}"
+EndProject
+Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "testlcd", "testlcd\testlcd.cproj", "{B964892D-A92F-44D4-AF99-3ADC61820917}"
+>>>>>>> Stashed changes
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -67,14 +75,28 @@ Global
 		{C81B68AA-F4BB-4A5D-81F8-2737DCD1D4A7}.Debug|AVR.Build.0 = Debug|AVR
 		{C81B68AA-F4BB-4A5D-81F8-2737DCD1D4A7}.Release|AVR.ActiveCfg = Release|AVR
 		{C81B68AA-F4BB-4A5D-81F8-2737DCD1D4A7}.Release|AVR.Build.0 = Release|AVR
+<<<<<<< Updated upstream
+=======
+		{0FA0C637-5AC0-44F3-999B-49C114B97183}.Debug|AVR.ActiveCfg = Debug|AVR
+		{0FA0C637-5AC0-44F3-999B-49C114B97183}.Debug|AVR.Build.0 = Debug|AVR
+		{0FA0C637-5AC0-44F3-999B-49C114B97183}.Release|AVR.ActiveCfg = Release|AVR
+		{0FA0C637-5AC0-44F3-999B-49C114B97183}.Release|AVR.Build.0 = Release|AVR
+		{985D5C75-F61E-49F1-A532-66A1E6141552}.Debug|AVR.ActiveCfg = Debug|AVR
+		{985D5C75-F61E-49F1-A532-66A1E6141552}.Debug|AVR.Build.0 = Debug|AVR
+		{985D5C75-F61E-49F1-A532-66A1E6141552}.Release|AVR.ActiveCfg = Release|AVR
+		{985D5C75-F61E-49F1-A532-66A1E6141552}.Release|AVR.Build.0 = Release|AVR
+>>>>>>> Stashed changes
 		{B964892D-A92F-44D4-AF99-3ADC61820917}.Debug|AVR.ActiveCfg = Debug|AVR
 		{B964892D-A92F-44D4-AF99-3ADC61820917}.Debug|AVR.Build.0 = Debug|AVR
 		{B964892D-A92F-44D4-AF99-3ADC61820917}.Release|AVR.ActiveCfg = Release|AVR
 		{B964892D-A92F-44D4-AF99-3ADC61820917}.Release|AVR.Build.0 = Release|AVR
+<<<<<<< Updated upstream
 		{EB7415C6-2130-46AD-9842-612C67ADE6D4}.Debug|AVR.ActiveCfg = Debug|AVR
 		{EB7415C6-2130-46AD-9842-612C67ADE6D4}.Debug|AVR.Build.0 = Debug|AVR
 		{EB7415C6-2130-46AD-9842-612C67ADE6D4}.Release|AVR.ActiveCfg = Release|AVR
 		{EB7415C6-2130-46AD-9842-612C67ADE6D4}.Release|AVR.Build.0 = Release|AVR
+=======
+>>>>>>> Stashed changes
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Microcontrollers/Opdracht 2.2/main.c b/Microcontrollers/Opdracht 2.2/main.c
index b8166c7..eef2e4d 100644
--- a/Microcontrollers/Opdracht 2.2/main.c	
+++ b/Microcontrollers/Opdracht 2.2/main.c	
@@ -64,3 +64,37 @@ int main(void)
     }
 }
 
+
+void init_4bits_mode(void) {
+	// PORTC output mode and all low (also E and RS pin)
+	DDRC = 0xFF;
+	PORTC = 0x00;
+
+	PORTC = 0x20;	// (0x28 for 2 lines)
+	lcd_strobe_lcd_e();
+}
+
+void init_4bits_mode(void) { 
+	
+	// PORTC output mode and all low (also E and RS pin)
+	DDRC = 0xFF;
+	PORTC = 0x00;
+	
+	PORTC = 0x20;	// function for 4-bit 1 row
+	lcd_strobe_lcd_e();
+
+	PORTC = 0x20;   // function high nibble 4-bit 2 row
+	lcd_strobe_lcd_e();
+	PORTC = 0x80;	// function low nibble 4-bit 2 row
+	lcd_strobe_lcd_e();
+
+	PORTC = 0x00;   // function high nibble turn on visible blinking-block cursor
+	lcd_strobe_lcd_e();
+	PORTC = 0xF0;   // function low nibble turn on visible blinking-block cursor
+	lcd_strobe_lcd_e();
+
+	PORTC = 0x00;   // Entry mode set high nibble
+	lcd_strobe_lcd_e();
+	PORTC = 0x60;	// Entry mode set low nibble
+	lcd_strobe_lcd_e();
+}
\ No newline at end of file
diff --git a/Microcontrollers/testlcd/Debug/testlcd.lss b/Microcontrollers/testlcd/Debug/testlcd.lss
index 0a359c6..6c164d6 100644
--- a/Microcontrollers/testlcd/Debug/testlcd.lss
+++ b/Microcontrollers/testlcd/Debug/testlcd.lss
@@ -21,11 +21,11 @@ Idx Name          Size      VMA       LMA       File off  Algn
                   CONTENTS, READONLY, DEBUGGING
   8 .debug_frame  000000b8  00000000  00000000  00001b6c  2**2
                   CONTENTS, READONLY, DEBUGGING
-  9 .debug_str    00000479  00000000  00000000  00001c24  2**0
+  9 .debug_str    000004a0  00000000  00000000  00001c24  2**0
                   CONTENTS, READONLY, DEBUGGING
- 10 .debug_loc    00000299  00000000  00000000  0000209d  2**0
+ 10 .debug_loc    00000299  00000000  00000000  000020c4  2**0
                   CONTENTS, READONLY, DEBUGGING
- 11 .debug_ranges 00000048  00000000  00000000  00002336  2**0
+ 11 .debug_ranges 00000048  00000000  00000000  0000235d  2**0
                   CONTENTS, READONLY, DEBUGGING
 
 Disassembly of section .text: