Update README.md

README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 VeryShadyRecords
 
 
@@ -16,9 +17,16 @@ Record Label Management System using Netbeans and MySQL
 Environment and Requirement
 
 
+
 Programming Language: JAVA with Swings
+
+
 MySQL Conncector: MySQL JConnector 5.1.40(JDBC Driver) https://dev.mysql.com/downloads/connector/j/
+
+
 IDE: NetBeans 8.1
+
+
 MySQL Version: 5.5.4
 
 
@@ -34,4 +42,8 @@ Instructions
 	4.Connect the JDBC driver(JConnector) by including the it's JAR File in the Project
 		Expand Project->Libraries->(Right Click)ADD JAR File->include file: mysql-connector-java-5.1.40-bin.jar
 	5.Database setting can be changed
-		Replace the username and password according to your MySQL settings in the Connection Statement.
+		Replace the username and password according to your MySQL settings in the Connection Statement.
+=======
+# VeryShadyRecords
+ Record Label Management System
+>>>>>>> parent of 9788e33... Update README.md