Initial commit
first commit.
Added the theme.
Running with new theme.
blagh line endings but stuff is combined.
Fixed merge conflicts.