update
Merge branch 'master' of https://github.com/JosephSamMorris/Pratt-Wearables-Fall-2013

Conflicts:
	TSL2561 Light Sensor.jpeg