added gitignore for site folder
initial merged layout
working template