Merge branch 'master' of https://github.com/HMMSummerResearch/PhylogeneticNetworks

Conflicts:
	.idea/workspace.xml
	out/production/PhylogeneticNetworks/Main.class