Completed Challenge 2
pull from origin resolved conflicts, removed redundant files