Mergde dinge
Merge branch 'master' of
https://github.com/NorthernStars/MR-Web-Graphics.git

Conflicts:
	logs/.gitignore
	logs/node_webserver.log