Merge branch 'master' of https://github.com/skanjarkar/imgtovideo

Conflicts:
	Gemfile
Merge branch 'master' of https://github.com/skanjarkar/imgtovideo