specify correct branch in instructions
easier way to get a random slide
add MVC separation to example slider
specify erb language
Merge branch 'master' into 2-0-stable

Conflicts:
	readme.md