Installed Jekyll
Merge branch '1nautilus'

Conflicts:
	index.html