Adds student file for A. Mitchell Bullard
fix merge conflict
fix merge conflict