Moving SOFEA forward.
Merge branch 'master' of github.com:rest-apps-talk/slides

Conflicts:
	index.html