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

Made planetstats.jsp