copy from skeleton

copy
Update bcoffma4-Assignment2.html
Update bcoffma4-Assignment2.html
fix merge conflict in bcoffma4-Assignment2.html