Fixed some merge issues and tweaked a few styles on the articles page. I think I addedin a load more colors as well, not really sure I was pretty wasted