From 1fd89a6872db18d1c067edd340be0b2c3d071403 Mon Sep 17 00:00:00 2001
From: Sean Coonce <sean@guidebook.com>
Date: Tue, 28 Apr 2015 10:55:36 -0700
Subject: [PATCH 1/2] Updates README to add installation docs.

---
 README.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b220afa..b9e2ebd 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,18 @@ Sublime syntax highlighting for CJSX
 
 ## Installation
 
-Coming soon...
+To install this plugin from Github, follow these steps:
+
+1. Open Sublime and open "Package Control" (cmd + shift + p).
+1. Type "Add Repository"; select the result (hit enter).
+1. At the bottom of your Sublime window you will see a text input that prompts you for the Github URL.
+1. Copy and paste: "https://github.com/Guidebook/sublime-cjsx".
+1. Give Sublime a few minutes to add the repo.
+1. Open "Package Control" again (cmd + shift + p) and type "Install Package".
+1. Type "sublime cjsx"; select the result (hit enter).
+1. Give Sublime a few minutes to install the package.
+1. Open a .cjsx file and in the lower right hand corner of your Sublime window, open the syntax dropdown.
+1. Select 'CJSX' and smile.
 
 ## Credit
 

From 4337441fadebd0e911894bbb4279f9b257d1bc6a Mon Sep 17 00:00:00 2001
From: Geoff Daigle <highwaytoinfinity@gmail.com>
Date: Fri, 29 May 2015 10:58:54 -0400
Subject: [PATCH 2/2] Fixed highlighting problem

Previously, self-closing tags messed up highlighting...
```javascript
<MyComponent
  key={@props.key}
/>
```

...instead, requiring a closing tag even when no children are supplied.
```javascript
<MyComponent
  key={@props.key}
></MyComponent>
```


This patch removes the need to always provide a closing tag.
---
 syntax/CJSX.tmLanguage | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/CJSX.tmLanguage b/syntax/CJSX.tmLanguage
index aa33169..3c84de7 100644
--- a/syntax/CJSX.tmLanguage
+++ b/syntax/CJSX.tmLanguage
@@ -879,7 +879,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(&lt;/)(\2)([^&gt;]*&gt;)</string>
+			<string>(&lt;/)(\2)([^&gt;]*&gt;)|(\/&gt;)</string>
 			<key>endCaptures</key>
 			<dict>
 				<key>1</key>
@@ -970,7 +970,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(&lt;/)([^&gt;]+)(&gt;)</string>
+			<string>(&lt;/)([^&gt;]+)(&gt;)|(\/&gt;)</string>
 			<key>name</key>
 			<string>tag.close.coffee</string>
 		</dict>