ddd
Merge branch 'master' of https://github.com/rik6167/m_8

Conflicts:
	public/error_log.txt