first commit
Merge pull request #5 from ysimon57/master

pull request exam