no content yet...
Merge branch 'addslidecontent'

Conflicts:
	Gemfile