Fixes #49 error_reporting in index.php
Merge branch 'fix-49' of https://github.com/JN-Jones/merge-system into JN-Jones-fix-49

Conflicts:
	index.php
Merge branch 'JN-Jones-fix-49'