meh nothing necessary
worked on changing the homepage structure so that html is not replaced
fixed merge errors