modified:   plinth-startup.sh Restrict access to Plinth via Apache2 to local ip's only.
	modified:   plinth-startup.sh Restrict access to Plinth via Apache2 to local ip's only.
Merge branch 'master' of https://github.com/Keith2/freedom-maker

Conflicts:
	source/home/fbx/plinth-startup.sh

	modified:   plinth-startup.sh Restrict access to Plinth via Apache2 to local ip's only.