Merge pull request #2 from nicklynchjonely/master

update commits
Merge pull request #1 from nicklynchjonely/master

Update commit
Merge pull request #3 from nicklynchjonely/master

update commits
Update Matrix

Updated Decision Matrix
Updated Readme

Updated readme file
Merge pull request #4 from nicklynchjonely/master

update commits
block diagram

hopefully can clear up confusion I am bad at proposals
Updated README.txt

Updated README.txt
Merge pull request #7 from ccarmen/master

Merge pull request #1 from nicklynchjonely/master
Updated README.txt

Updated README.txt
Merge pull request #5 from nicklynchjonely/master

update commits
added color sensor proposals
Merge pull request #8 from ddenhart/master

color sensor proposals
Merge pull request #2 from nicklynchjonely/master

New commit
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