Merge remote-tracking branch 'origin/Ar' into david4
Merge remote-tracking branch 'origin/Ar' into david3
Merge remote-tracking branch 'origin/bea'
Merge branch 'bea' into david4
Merge branch 'bea' into david3
Merge remote-tracking branch 'origin/master'
Added pop-ups (AlertDialogs) for Multiplayer option.
Merge remote-tracking branch 'origin/bea' into bea
Added a check for a null surfaceview in onPause in case the game is
paused before the surfaceview is instantiated.
Merge branch 'david3' into david4
Merge remote-tracking branch 'origin/bea' into david4
Merge remote-tracking branch 'origin/bea' into david3
Merge branch 'david3'
Removed unnecessary buttons. Added transparent picture for settings page
so that Credits could still be seen but gives off the layering effect
that the buttons are on top.
Merge remote-tracking branch 'origin/bea' into bea
Merge remote-tracking branch 'origin/bea' into david4
Merge remote-tracking branch 'origin/bea' into david3
Fixed credits removal from settings screen.
Merge branch 'david3'
Fixed another glitch in credits removal.