.gitignore
Merge branch 'dev'

Conflicts:
	.gitignore
Update readme
Merge branch 'dev'

Conflicts:
	.gitignore
Merge branch 'dev'
Merge branch 'dev'
visualizations for video description
visualize annotated video description part 1
Merge branch 'oana' into dev

Conflicts:
	composer.json