changed things
Merge remote-tracking branch 'origin/master'

Conflicts:
	FragmentTesting/app/src/main/java/mcpartland/donald/Battleship/GameListFragment.java