Update README.md
Update README.md
Update README.md
Update README.md
Merge branch 'cs100-2014fall' of https://github.com/fvera002/ucr-cs100 into cs100-2014fall

Conflicts:
	assignments/hw/hw0-rshell/README.md
Merge branch 'grades' of https://github.com/fvera002/ucr-cs100 into grades
graded assignment using automatic scripts