added my name to AUTHORS.txt
Merge branch 'master' of http://github.com/Mynameisspam1/612-2014 into merge

Conflicts:
	AUTHORS.txt
merge