additional changes

index.php
Merge branch 'master' of https://github.com/szymonmat/1508

Conflicts:
	index.html
x