Merge branch 'master' of /home/student/m/mgeertsema/DBP13/MMOG with conflicts.
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote branch 'origin/master'
+Add some views to Galaxy,Planets and Sunsystems