added everyone
WOOT
Merge remote-tracking branch 'gidden-upstream/2013-04-uwmadison' into 2013-04-uwmadison

Conflicts:
	README.md