Checking what happens if editing the same file.
Merge branch 'master' of https://github.com/spiritnoise/CollaborationTest

Conflicts:
	index.php