First design (layout and devise)
Merge branch 'dev' of https://github.com/ellokopoko/prog into dev