Merging Encoder class and i2c functions from chuck-testing branch
Merged Makefile from chuck-testing
deleted old / testing components. keeping our shit clean.
Merge branch 'master' of https://github.com/nckswt/FARSHAPE

Conflicts:
	sensing/imgproc/opencvtest.py
	sensing/imgproc/output.avi
added calibration.txt
added calibration.txt and tests for IR sensors
Added convenience functions for Oscar
Merge branch 'chuck-testing' of https://github.com/nckswt/FARSHAPE into chuck-testing
Added oscar's camera class
Merge branch 'master' of https://github.com/nckswt/FARSHAPE

Conflicts:
	location/encoders.c
	tests/encoder_test.c
Abstracted I2C reads/writes/asserts to helper functions to make calls cleaner
Added Motor class
I hjate life
bitch
Added ROS msg passing as a separate thread
Added test for location message passing
Added linker flags for ros message passing and read_test
Cleaned up old files, moved things around, updated Makefile
Merging stable code from branch 'chuck-testing'

Conflicts:
	Makefile
	system/i2c.cpp
	tests/encoder_test.c
Updated i2c drivers to the latest version