Merge branch 'master' into allen
Merge branch 'master' into allen
Merge branch 'master' into allen
working on speech right now
adding speach recognition
fixing conflict
unstable version of speed recognition
fixing conflict
adding voice command
Merge branch 'allen'