added additional buttons to stop errors
resolved merge conflict
Merge branch 'master' of https://github.com/buddingmonkey/monocular