added vagrant
added srt parser
removed from fixation
Finish subtitle-parser
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.gitignore
	.travis.yml