Merge pull request #35 from KackieM/katinfo

Katinfo
lots of adds
Merge pull request #36 from shawnlknight/shawnInfo

lots of adds
lots of additions
Merge pull request #37 from shawnlknight/shawnInfo

lots of additions
deleted item from data.js
Merge pull request #38 from shawnlknight/shawnInfo

deleted item from data.js
added shot template
Merge pull request #39 from shawnlknight/shawnInfo

added shop template
more edits
Merge pull request #40 from shawnlknight/shawnInfo

more edits
added js link to shop.html
Merge pull request #41 from shawnlknight/shawnInfo

added js link to shop.html
adding ship java files