Made rings draw in a while loop
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/macalester/comp124/life/Conway.java
	src/edu/macalester/comp124/life/MainWindow.java