Initial commit
created layout
fixed conflicts