adds my name
merge
Merge branch 'landon1013-master'