Added fps option, defaults to 24fps
Merge branch 'master' of github.com:Wollw/Video-Rotater

Conflicts:
	src/main.cpp