commit 4
Merge pull request #1 from StudentGroup2014OS/master

commit 4