gistfile1.rbx

# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#	unmerged:   README
#	modified:   README
#	unmerged:   app/controllers/application.rb
#	modified:   app/controllers/application.rb
#	unmerged:   config/boot.rb
#	modified:   config/boot.rb
#	unmerged:   config/database.yml
#	modified:   config/database.yml
#	unmerged:   config/environment.rb
#	modified:   config/environment.rb
#	unmerged:   config/environments/development.rb
#	modified:   config/environments/development.rb
#	unmerged:   config/environments/production.rb
#	modified:   config/environments/production.rb
#	unmerged:   config/environments/test.rb
#	modified:   config/environments/test.rb
#	unmerged:   config/routes.rb
#	modified:   config/routes.rb
#	unmerged:   public/images/rails.png
#	modified:   public/images/rails.png
#	unmerged:   public/index.html
#	modified:   public/index.html
#	unmerged:   public/javascripts/controls.js
#	modified:   public/javascripts/controls.js
#	unmerged:   public/javascripts/dragdrop.js
#	modified:   public/javascripts/dragdrop.js
#	unmerged:   public/javascripts/effects.js
#	modified:   public/javascripts/effects.js