updated player selection
concluding merge
had some little things that werent looking right
Merge conflict commit
trying to fix merge
Merge pull request #14 from reinaldo422/master

M2 Update
New file planetStats for pop up page
To be able to pull
starting planetStats
Added method for calculating more fleets
Merge pull request #15 from nirvan543/master

Added calcMoreFleets
for the merge
Merge pull request #17 from bware225/master

Made planetstats.jsp
small changes to Player
Modified planet generation script to include new url variable.
Merge branch 'master' of https://github.com/jfoster39/cs2340-team8 into planetInfo
fixing merge
got rid of player selection junk and fixed player class
Made changes to player
Merge pull request #19 from bware225/master

Updates newFleets to be added before each player's turn