Merge pull request #8 from ddenhart/master

color sensor proposals
Adding proposals
Merge pull request #9 from jerscott/jerscott-ece411

Adding proposals
block diagram

adding block diagram
Update readme.txt
readme update

updated readme
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.txt
Merge pull request #6 from nicklynchjonely/master

update commits