Authors.txt edit
Merge https://github.com/ethanhuey/612-2014

Conflicts:
	AUTHORS.txt