Merge branch 'master' into 'IE2.0'

# Conflicts:
#   README.md

README.md

@@ -59,6 +59,7 @@ npm run build
 
 ## Settings
 
+<<<<<<< README.md
 You can set paths, browser compatibility and port number in `config.yml`.
 
 ## Add project 
@@ -69,41 +70,44 @@ You can set paths, browser compatibility and port number in `config.yml`.
 	- Add all files to GitHub.
 	
 	```bash
-		git add .
+	git add .
 	```
 	
 	- Commit your changes with message
 	
 	```bash
-		git commit -m "YourCommitMessage"
+	git commit -m "YourCommitMessage"
 	```
 	
 	- Checkout to master branch
 	
 	```bash
-		git checkout master
+	git checkout master
 	```
 	
 	- Take pull from master branch
 	
 	```bash
-		git commit -m "YourCommitMessage"
+	git commit -m "YourCommitMessage"
 	```
 
 	- Checkout to your new branch
 	
 	```bash
-		git checkout YourBranch
+	git checkout YourBranch
 	```
 
 	- Merge with master
 	
 	```bash
-		git merge master
+	git merge master
 	```
 	
 	- Push the files
 	
 	```bash
-		git push
-	```
\ No newline at end of file
+	git push
+	```
+=======
+You can set paths, browser compatibility and port number in `config.yml`.
+>>>>>>> README.md