minor changes
Merge branch 'master' of https://github.com/jfoster39/cs2340-team8
to pull in changes
for merge
Added back next.jsp
for the pull
for merge
test
Merge branch 'master' of https://github.com/jfoster39/cs2340-team8
for merge
for merge
New turn settings
test
Updating for m3 changes
test
test
fixing add fleet button
for pull
Finishing up m3
test