Slides
Merge branch 'develop'

Conflicts:
	static/images/slide2.jpg