Spirit of Art...
Merge branch 'JL' of github.com:davincicoders/2013-q2-rails-1 into JL