a
s
a
Merge branch 'master' of https://github.com/jayact/Genomic_SWE

Conflicts:
	bin/tester/Gene_Tester.class
	src/tester/Gene_Tester.java
a
x
c
s