added my name, yo
merge
Merge branch 'spencerrwise-master'