Branching for new site.
Removing old site, adding WordPress.
Removing .DS_Store
Cleaning old folders.
Adding bootstrap theme.
Numerous additional plugins. Theme changed to 'responsive'. Added 'bones' theme for future updates.
Setting up heroku staging environment
Fixing .htaccess
Fixing .htaccess again
Adding relative URLs plugin. Fixed permalinks after .htaccess change.
Fixing calendar. Fixing contact form.
Fixed calendar and emails.
...
Merge attempt
Merge staging again.
Sitemap.