Changed font size
Added twitter link
Make the link open in a separate tab
Added lorem ipsum text
Added nyancat image
Changed hello world to O hai
Changed title o hai o hai
Changed bgcolor
Change header to O hai O hai
Changed main paragraph color to blue
Resolved conflicts