updated player selection
concluding merge
Merge conflict commit
trying to fix merge
New file planetStats for pop up page
To be able to pull
Merge pull request #15 from nirvan543/master

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

Made planetstats.jsp
got rid of player selection junk and fixed player class
Merge branch 'master' of https://github.com/jfoster39/cs2340-team8