initial commit
merge conflicts
successful merge of old and new
set frame rate
made inclusion of ps3eye code optional
removed ps3eye addon dep
ps3eye framerate and size set
Merge branch 'master' of github.com:ishback/talking
adjusted ps3 camera size