adding tests
adding tests
Merge branch 'master' of github.com:ardmore/website
changed config/deploy/production.rb
Merge branch 'master' of github.com:ardmore/website