Adding author name
Taken latest changes
Merge branch 'master' of https://github.com/uc-pkm/testing.git

Conflicts:
	index.php