Implement site-specific HTML for starting page
Resolve conflicts
Add new files