updaterad index

jkkj
Merge branch 'master' of https://github.com/niklasm86/WordPress

Conflicts:
	index.php
added a new comment in index.php