made it jekyll
fizing merge issues