Merge pull request #11 from sergiozt/master

#4. Issue 4 comment
#2 Some changes
Merge pull request #12 from ForceMan88/master

#2 Some changes
#2 Some changes 2
Merge pull request #13 from ForceMan88/master

#2 Some changes 2
#3 the first commit
Merge pull request #15 from fortegente/master

#3 the first commit
#4. Changes on branch dev_4_0_1
#2 #3 #4 Add changes to all files.
#3 #4 #2 Changed user email
Merge remote-tracking branch 'upstream/master'
#4. Resolve pull problems
#4. Resolve pull problems
#3 add a very strange line
#3 pull from upstream
#3 add new line
#3 add new line
Merge pull request #19 from fortegente/master

#3 the second test commit
#3 make some change on the test branch
Merge pull request #23 from fortegente/test_branch

#3 pull request from a new branch