Changed footer, fixed api references and created challenge six
Fixed merge isues