first comit
Merge pull request #1 from ikopas/master

first comit