Ver 2
Merge branch 'master' of https://github.com/Dovzhikov/Java

Conflicts:
	Planetary Model 3/.idea/workspace.xml
	Planetary Model 3/out/production/Planetary Model 3/Main$DrawPanel.class
	Planetary Model 3/out/production/Planetary Model 3/Main.class
	Planetary Model 3/src/Main.java