first commit
Merge https://github.com/gidkom/mysite