THis is another merge commit test
Merge branch 'master' of https://github.com/jonno2012/dispatcher

Conflicts:
	index.php