changed contact.css
fixed conflicts
modified contact.css and contact/new.html.erb
Merge branch 'master' of github.com:ardmore/website
modified contact.css and contact/new.html.erb
Merge branch 'master' of github.com:ardmore/website
Merge branch 'master' of github.com:ardmore/website
modified contact.css and contact/new.html.erb
Merge branch 'master' of github.com:ardmore/website