Changed whole site

Updating site for testing purposes.
Fixing conflicts