fix up the command line thing
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/tbodt/trp/TheRapidPermuter.java