test branch comment
another testbranch comment
last test for testbranch
concluded merge
Updated star system and planet
Merge pull request #9 from bware225/master

Updated Star System and Planet
fixed an error where we didnt call hasOwner method
the star system to work properly
changed variable system to allTheSystems, since this is the arrarList that holds the systems for each player
realized I did a find and replace which made some functions look bad
added getter for star system
changed player a little bit
merge it

ch 'unitTesting'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge pull request #10 from bware225/starsystem

added getter for star system
Merge pull request #11 from reinaldo422/master

next.jsp now creates galaxies based on number of players
added another constructor to player
added more M2 stuff, changed GameLogic