Lw58 Lw6
Merge branch 'master' of https://github.com/olikik/web

Conflicts:
	lw58/index.php