Merge branch 'crazy'

* crazy:
  Add news item for rainbow
  Link index.html to rainbow.html
  Add CSS sytlesheet to rainbow.html
  Rename crazy.html to rainbow.html
  Add a rainbow to crazy.html

# Conflicts:
#	index.html
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch master
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   index.html
#	new file:   rainbow.html
#
