Updated README.txt

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

New commit
Merge pull request #10 from ccarmen/master

Merge pull request #2 from nicklynchjonely/master
Merge pull request #3 from nicklynchjonely/master

Updating contents
Merge branch 'master' of https://github.com/nicklynchjonely/ece411-practicum-2014

Conflicts:
	readme.txt
Merge branch 'master' of https://github.com/nicklynchjonely/ece411-practicum-2014
Merge pull request #11 from ccarmen/master

Merge pull request #3 from nicklynchjonely/master
Merge pull request #7 from nicklynchjonely/master

update commits