Merge branch 'master' of https://github.com/mohitwildbeast/Data-Struc…

…tures-In-C

README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Data-Structures-In-C
 Implementation of Data Structures like Stacks, Queues, etc. using C programming language.
 
@@ -11,3 +12,18 @@ Programs Included -
 ### Infix to Prefix conversion using Stack
 ### Linked List ADT (TODO)
 ### Polynomial Evaluation through Linked List
+=======
+# Data-Structures-In-C
+Implementation of Data Structures like Stacks, Queues, etc. using C programming language.
+
+Programs Included -
+
+### Stack ADT
+### Queue ADT
+### Circular Queue ADT
+### Priority Queue (TODO)
+### Infix to Postfix conversion using Stack
+### Infix to Prefix conversion using Stack
+### Linked List ADT (TODO)
+### Polynomial Evaluation through Linked List (TODO)
+>>>>>>> faedd5a7dbe1d068022702b0d2ff0381bd21d53e