created layout in index.html
created layout
fixed conflicts
fixed big comflict
Merge pull request #1 from buzzlightyear182/layout

Layout