gitignore
fixing conflict
initial jekyll files