Added flotilla control, added screen overlay

Added new code to allow flotilla control, as well as added a screen
overlay
Fixed conflicts in Flotilla.java