changed the size of the twitter timeline
fixed conflicts
Merge branch 'develop' of https://github.com/soolaimon/mobile_noms into develop
pulling for the day
added a mailchimp form to the site index
Merge branch 'mailchimp' of https://github.com/soolaimon/mobile_noms into mailchimp
mailchimp styling is fixed on site/index page