fuzzy link matching DONE
Merge branch 'master' of github.com:choicess/PennAppsFall2013

Conflicts:
	domManipulator/manifest.json
	domManipulator/script.js
fuzzy logic
mergeeeeeeeee

Merge branch 'master' of github.com:choicess/PennAppsFall2013
fuzzy logic
Merge branch 'master' of github.com:choicess/PennAppsFall2013

trying to merge into master