sliding panel
Merge branch 'master' of https://github.com/exklamationmark/esta_noche_2013

Conflicts:
	header.php
	page.php
	style.css