started basic speech recognition with sphinx
adding mjpg-streamer to commit
last file to commit
wtf just fucking commit so I can merge. come on, git
Merge branch 'speech'
fixed makefile for speech; removed branches because I wasnt happy about how it was working
Merge branch 'master' of https://github.com/saites/guggug