Fixes #50 weird logic in functions.php
Merge branch 'fix-50' of https://github.com/JN-Jones/merge-system into JN-Jones-fix-50

Conflicts:
	resources/functions.php
Merge branch 'JN-Jones-fix-50'