added my name
Merge branch 'master' of git://github.com/jbramnick/612-2013 into jim

Conflicts:
	AUTHORS.rst