Edit 2 - no text conflict
Merge branch 'master' of https://github.com/Heath2412/TestSemanticConflict

Conflicts:
	index2.php