Backing up before pull.
Merge branch 'master' of https://github.com/funkflute/MagicMirror

Conflicts:
	index.php
fixed merge