added sales create form with nested items create form; added items_attributes to strong params whitelist; trivial change to item model validation to allow nested creation
javascript to allow dynamic generation of additional items in nested form
Merge pull request #18 from HydraJax/views/sales

Views/sales
added rspec test file for page_management
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
fixed js in new sales_items form; added to "my_transactions" in dashboard - separated buyer/seller transaction; hid confirm/cancel buttons for reserved items on items show
Merge pull request #20 from radcliff/views/sales

Views/sales
Merge pull request #19 from dantecarlesimo/Rspec-PageController

added rspec test file for page_management & added user id to user factory for test to run
Merge branch 'Paperclip' of https://github.com/dantecarlesimo/garage into Paperclip

Conflicts:
	app/views/items/show.html.erb
	app/views/sales/new.html.erb
Merge pull request #23 from radcliff/Paperclip

Paperclip