Initial commit
initial site template
merging master
fixing conflict