Made blacklist as string array, added constructor
Merge remote-tracking branch 'origin/master'

Conflicts:
	ParseUnit/src/com/army_builder/Option.java