Updated author list.
Merge commit '06dd8e1c6ffba33b697c1306d368cdb2a173ff27'

Conflicts:
	index.html
Merge branch 'master' of github.com:solymosi/webfejlesztes-feladat