asdf
Merge branch 'LA' of github.com:davincicoders/2013-q2-rails-1 into LA