temp
correct flow
Merge branch 'dev' of https://github.com/pasqLisena/MediaFragPlayerDemo into dev

Conflicts:
	public/css/MFstyle.css
	views/video.ejs
Merge branch 'dev' of https://github.com/pasqLisena/MediaFragPlayerDemo into dev
Merge branch 'dev' of https://github.com/pasqLisena/MediaFragPlayerDemo into dev

Conflicts:
	public/css/MFstyle.css
	views/video.ejs