first commit development2

added file
solved merging master and development2

corrected merging conflic
Merge pull request #2 from jobsonita/development2

first commit development2