final commit

I am a little confused on weather or not i merged everything properly
and did all the correct steps when committing.