stealing some links from steve dietz
Merge branch 'master' of github.com:lmccart/AppropriatingInteractionTechnologies

Conflicts:
	readme.md