Merge pull request #14 from pamelawang/pam-in-progress

Merge branch 'master' into pam-in-progress (Updating branch)
Merge pull request #15 from pamelawang/master

Updating Meera
Merge pull request #16 from pamelawang/meera

Merge pull request #15 from pamelawang/master
Merge pull request #17 from pamelawang/pam-in-progress

Created WelcomePanel, StatsPanel and BattleshipGUI
Merge pull request #18 from pamelawang/pam-in-progress

More Boat testing
Working on GridPanel
To make life easier
Merge branch 'master' into pam-in-progress

Conflicts:
	BattleshipGUI.class
	BattleshipGUI.java