Minor fixes
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/me/kosannicholas/GeometricMagic/GeometricMagic.java
Merge remote-tracking branch 'origin/dev' into dev
Beginnings of SetCircles