Added my name to authors.txt
Merged w/ Jackson
Merge branch 'master' of https://github.com/m0stlyharmless/Fellowship-of-the-Robot

Conflicts:
	authors.txt