got paperclip working/modified views & config files to work with paperclip
removing files/changes that shouldn't be in this branch
removed un-needed file for this branch
resolved conflict
updated photo sizes in models
updated new sale show page to match master to resolve conflict
modified item show page/pic view
Merge branch 'Paperclip' of https://github.com/dantecarlesimo/garage into Paperclip

Conflicts:
	app/views/items/show.html.erb
	app/views/sales/new.html.erb