doing some conflict testing
Merge branch 'conflict-testing'

Conflicts:
	README.md
	index.php