Updated links in readme
Merge branch 'master' of https://github.com/ucsc-cs111-spr-2014/cs111-project-4

Conflicts:
	README.md