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