+1 for Freecodecamp, also something that helped me a LOT was actually doing projects. Specifically, Envato Tuts+ has a lot of PSD to HTML conversion courses that helped a lot.