Improved visualization, changed color scheme of flowers.
Resolved merge conflicts. Merge branch 'develop' of https://github.com/gminaker/cs410 into visualization

Conflicts:
	src/visualization/visualizer.java
commented out unused lines in setup() to be able to run.