Added voice recognition
Merge branch 'master' of https://github.com/jasongoh1987/Hackathon

Conflicts:

VideoSubtitling/src/com/example/videosubtitling/MainActivity.java