lalalala
modified
Merge branch 'feature/x1' of https://github.com/EDAURU/doc-4-js into feature/x1

Conflicts:
	public/app/doc4js.js