pushing my code to git. won't compile on my system due to BattleShip error I believe
Merge pull request #4 from jcrabb13/master

eh?