Worked on photo thingy
new file:   app/controllers/.photos_controller.rb.LOCAL.85161.rb.swp
modified:   app/controllers/photos_controller.rb
new file:   app/controllers/photos_controller.rb.BACKUP.85161.rb
new file:   app/controllers/photos_controller.rb.BASE.85161.rb
new file:   app/controllers/photos_controller.rb.LOCAL.85161.rb
new file:   app/controllers/photos_controller.rb.REMOTE.85161.rb
modified:   app/models/photo.rb
new file:   app/views/photos/new.html.erb
new file:   public/system/photos/item_images/000/000/001/medium/001bulbasaur.jpg
new file:   public/system/photos/item_images/000/000/001/original/001bulbasaur.jpg
new file:   public/system/photos/item_images/000/000/001/thumb/001bulbasaur.jpg
add image upload feature (it's working on this branch)
merge working image upload to master branch
add destroy function for item_images
add authentication feature
add seeds.rb for seeding test to db