Merge branch 'issue1' of ssh://git.ablecorp.us:20/Mesh/meshup into issue1

src/lib.rs

@@ -17,9 +17,11 @@ pub struct CodeBlock {
     text: String,
 }
 
-pub struct Emphasis {
+pub struct StyledText {
     italic: bool,
     bold: bool,
+    underline: bool,
+    color: Option<RGBA>,
     text: String,
 }
 
@@ -28,6 +30,7 @@ pub struct Blockquote {
     text: String,
 }
 
+<<<<<<< HEAD
 pub struct Link {
     text: String,
     url: Url,
@@ -40,9 +43,23 @@ pub struct Image {
     title: Option<String>,
     link: Option<Link>,
 }
+=======
+pub enum Node {
+    Header(Header),
+    Paragraph(Vec<StyledText>),
+    HRule,
+}
+
+pub struct Document(Vec<Node>);
+>>>>>>> d808ae46ad469d6024e76ad006f7b3e0832fe8cb
 
 // TODO: able take care of lists i am too drunk for this tonight
 
+pub enum ListType {
+    Ordered,
+    Unordered,
+}
 
+pub struct List {}
 
 pub fn parse() {}