hide show slide

Conflicts:
	js/main.js