Reformat the document.
Added some enters.
Merge branch 'master' of https://github.com/Ocirina/CRIA

Conflicts:
	client/js/editor.js