Merge pull request #8 from it-shark-pro/improvements

Added documentation how to sync fork from original repo

Author: EduardTrutsyk

.travis.yml

@@ -1,3 +1,7 @@
 language: node_js
 node_js:
   - "lts/*"
+
+script:
+  - yarn run lint
+  - yarn run test

README.md

@@ -1,16 +1,22 @@
+[![Build Status](https://travis-ci.org/it-shark-pro/js-assignments.svg?branch=master)](https://travis-ci.org/it-shark-pro/js-assignments)
+![Hackage-Deps](https://img.shields.io/hackage-deps/v/lens.svg)
+[![Greenkeeper badge](https://badges.greenkeeper.io/it-shark-pro/js-assignments.svg)](https://greenkeeper.io/)
+
+# [Brest IT Shark](https://it-shark.pro/)
 [![IT Shark](https://avatars2.githubusercontent.com/u/34164782?s=200&v=4)](http://it-shark.pro/)
-# Brest IT Shark School
-## Javascript Assignments  [![Build Status](https://travis-ci.org/it-shark-pro/js-assignments.svg?branch=master)](https://travis-ci.org/it-shark-pro/js-assignments)
+## Javascript Assignments
 
-[![Greenkeeper badge](https://badges.greenkeeper.io/it-shark-pro/js-assignments.svg)](https://greenkeeper.io/)
+### Docs
+* [How to sync your fork from original repo to keep up with their changes](/docs/sync-fork.md)
+* [Submit your solution to us for review](https://goo.gl/X6GjMB)
 
 Yet another javascript assignments. There are a lot of interactive javascript resources for beginners, but most of them are online and do not cover the modern programming workflow. There are some excellent training resources on github (https://github.com/rmurphey/js-assessment, https://github.com/mrdavidlaing/javascript-koans, https://github.com/vasanthk/js-bits etc) but they are not exactly simulate the everyday programming process. So the motivation of this project is to show TDD process in the wild to the beginners. Assingment tests are implemented in various ways to feel a difference and gain the experience what manner is good, what is bad and what is ugly.
 
 Another idea is to prepare assignment to cover all standard javascript functions, to drilling and mastering skills. Some tasks are practical, but some tasks are rather synthetic.
 
 And the last idea is to inure trainees to work using unit test and feel uncomfortable when programming without tests.
 
-To start javascript assignments please follow the next steps:
+### To start javascript assignments please follow the next steps:
 *  [Fork this repo](#user-content-how-to-fork-this-repo)
 *  [Setup travis-ci to test the commits](#user-content-how-to-setup-travis-ci)
 *  [Setup the work environment](#user-content-how-to-setup-work-environment)
@@ -109,14 +115,11 @@ There is an easier way to debug for beginners with free Visual Studio Code:
 * Click in the gutter to the left of the line number to set the breakpoint. Press `F5` to run debug.
 * NOTE: The `launch.json` is stored in the `.vscode` project folder.
 
-### Submit your solution to us for review
-* https://goo.gl/X6GjMB
-
 ## Contribution
 Feel free to contribute into this project. New tasks and katas are welcome.
 
 ## ESLint 
 To fix linting execute:
 ```
 npm run lint -- --fix
-```
+```

docs/sync-fork.md

@@ -0,0 +1,12 @@
+### 1. Add remote from original repository in your forked repository: 
+
+    `cd path/into/cloned/fork-repo`
+    `git remote add upstream [email protected]:it-shark-pro/js-assignments.git`
+    `git fetch upstream`
+
+### 2. Updating your fork from original repo to keep up with their changes:
+
+    `git pull upstream master`
+
+### 3. Resolve conflicts if needed and install npm packages
+    `npm update`