Added to the command line options. Changed cmake version.
Merge branch 'master' of github.com:/auntieNeo/TripRipper into develop

Conflicts:
	src/main.cpp