Alte Version
Merge branch 'master' of https://github.com/CPekaterina/Solar-System

Conflicts:
	build-solsys-Desktop_Qt_5_3_MinGW_32bit-Debug/debug/main.o
	build-solsys-Desktop_Qt_5_3_MinGW_32bit-Debug/debug/planet.o
	build-solsys-Desktop_Qt_5_3_MinGW_32bit-Debug/debug/solsys.exe
	solsys/main.cpp
	solsys/solsys.pro.user