Test branch changes
Diverigin more with branch test
Initial version of 'addition' is created in branch 'test'
Modification from master branch while branch 'test'is ongoing on same file.
Merge branch 'test'

Conflicts:
	README.txt

All conflics have been resolved. Merging branch 'test' into 'master'.