init commit.
Merge branch 'master' of github.com:yzheng624/video2gif

Conflicts:
	.gitignore