Website design

Merge feature branch into master before creating new branching model.