some fix
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story
Refactored Views
Refactored Views
Video is now an Activity
VideoView Activity is added
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story