Changed loop
Merge branch 'displayData' of https://github.com/uc-pkm/testing.git into
displayData

Conflicts:
	index.php