up to date
Merge branch 'JH' of github.com:davincicoders/2013-q2-rails-1 into JH