Added some proper placeholder content and snd added some intro text.
Fixed merge errors.