Changing the message.
Adding index.html with a silly message
Getting stuff to work
Fixing conflicts