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