ok
index seconds
Merge branch 'master' of https://github.com/morkid/2013

Conflicts:
	index.php