Merge pull request #3 from notsecure/master

Updating
Fixed main.h
Merge branch 'master' of https://github.com/CowInAPie/uTox

Blah
Merge pull request #234 from CowInAPie/master

UPDATE stop trying to read from camera when fatal error occurs