Merge

Conflicts:
	js/slides/1.html
	js/slides/2.html