For merge
Merge branch 'master' of https://github.com/iwob/DNA-sequencer

Conflicts:
	BIConsole/config.properties
	BIConsole/dna-seq.jar
	BIConsole/src/logic/Main.java