Created working basic layout from book example
Fixed template. Created basic pages and template pages
fixed conflicts
fixed conflicts