Resolve conflicts on merge

Author: alisonmonteiro

.gitignore

@@ -10,4 +10,6 @@ $RECYCLE.BIN/
 
 vendor
 composer.lock
-nbproject 
+nbproject 
+
+node_modules/

README.md

@@ -57,3 +57,14 @@ a.google{color:#c0392b;font-weight:700;font-family:Verdana, 'Open Sans';font-siz
 <a href="http://Facebook.com" class="facebook" style="color: #8e44ad; margin: 300px;">Facebook</a>
 <a href="http://Outlook.com" id="outlook" style="color: #2980b9; padding: 50; position: absolute; top: 30px; left: 500px;">Outlook</a>
 ```
+
+### Or run it with node
+1. Install dependencies
+```js
+	npm install
+```
+2. Run
+```js
+	node index example myResult
+```
+A file myResult.html will be genereted in templates/example.

index.js

@@ -0,0 +1,46 @@
+var request = require('request'),
+	fs = require('fs'),
+	myHost = 'http://cssinliner.dev/',
+	myBody = null,
+	myPath = null,
+	myTemplatesPath = 'templates/',
+	myOutput = 'output',
+	myPrefix = '- ';
+
+process.argv.forEach(
+	function(val, index, array) {
+		if(index == 2) myPath = val;
+		if(index == 3) myOutput = val;
+	}
+);
+
+if(myPath != null){
+	try {
+		stats = fs.lstatSync(myTemplatesPath + myPath);
+	    if (stats.isDirectory()) {
+	        
+			request(myHost + myTemplatesPath + myPath + '/' + myPath + '.php', 
+				function(err, response, body) {
+
+					if(err) console.log(err);
+
+					myBody = body;
+			  		console.log(myPrefix + 'Its works');
+					
+					fs.writeFile(myTemplatesPath + myPath + '/' + myOutput + '.html', myBody, 
+						function(err) {
+						    if(err) {
+						        return console.log(err);
+						    }
+
+						    console.log(myPrefix + 'The file was saved!');
+						}
+					);	
+				}
+			);
+
+	    }
+	}catch (e){
+		console.log(e);
+	}		
+}

package.json

@@ -0,0 +1,8 @@
+{
+  "name": "CSSInliner",  
+  "description": "Simple PHP tools that inserts CSS from file into HTML tags.",
+  "priavete": true,
+  "dependencies": {
+    "request": "~2.53.0"
+  }
+}

examples/example.php templates/example/example.phpexamples/example.php renamed to templates/example/example.php

@@ -1,7 +1,6 @@
 <?php
 
-require __DIR__ . '/../vendor/autoload.php';
-// require __DIR__ . '/../../../autoload.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
 use Northys\CSSInliner\CSSInliner;