Jekyll version warning
Merge branch 'src' of github.com:morea-framework/morea-framework.github.io into src

Conflicts:
	.idea/.name
	.idea/compiler.xml
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	.idea/workspace.xml
	src/.DS_Store