vidyasagar - Added sample database to seeds.rb
vidyasagar - resolved conflicts in articles controller