ff
ff
Merge branch 'master' of https://github.com/frankrefischer/STTRJ.git

Conflicts:
	startrekj/src/main/java/startrekj/ARRAY.java
	startrekj/src/main/java/startrekj/STRING.java
	startrekj/src/main/java/startrekj/StarTrek.java