Switch to Jekyll
Resolve conflicts switching to Jekyll