current before merge
Merge branch 'master' of github.com:jimtahu/OMShips_android
commit before attempt to move video to its own activity