changes to readme.txt file by team two, testing merge conflicts in phpstorm
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	readme.txt