Merge pull request #1 from popovicu/master

Merge
Added edit

Editted file.
Merge pull request #3 from coacoacoa/master

Added.