video title
mongoDB
Merge branch 'dev' of https://github.com/pasqLisena/MediaFragPlayerDemo into dev

Conflicts:
	views/welcome.ejs
Merge branch 'dev' of https://github.com/pasqLisena/MediaFragPlayerDemo into dev
temp
fix
correct flow
Merge branch 'dev' of https://github.com/pasqLisena/MediaFragPlayerDemo into dev

Conflicts:
	public/css/MFstyle.css
	views/video.ejs
retrieve ted videos and metadata
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
ted subtitles
Merge branch 'dev' of https://github.com/pasqLisena/MediaFragPlayerDemo into dev
metadata store in db
ted subtitles
ted subtitles
ted subtitles
temp
Merge branch 'dev' of https://github.com/pasqLisena/MediaFragPlayerDemo into dev
save nerd entitites on db