Setup an iframe for mplayerjs
Merge branch 'develop' of github.com:relajoapp/relajoapp.github.io into develop

Conflicts:
	source/index.html.erb