Merged controllers, commented out planet class

Planet class is commented out so that the program can be run