Add products/edit view
Homepage work, etc, etc..
Change home to display most recent image uploaded and limit to 3-4(?) imgs
This may need to just be reversed. Check it out anyway
Merge branch 'master' of github.com:AlexZerr/bonediva into sterling_work

Conflicts:
	app/controllers/products_controller.rb
	app/views/products/edit.html.erb
Merge branch 'sterling_work' of github.com:AlexZerr/bonediva

Conflicts:
	app/controllers/products_controller.rb
	app/views/products/edit.html.erb
Error fixing
Merge branch 'master' of github.com:AlexZerr/bonediva into sterling_work

Conflicts:
	app/controllers/products_controller.rb
	app/views/products/edit.html.erb
Add category model.
Create catagories controller and table.
Get create categories working.
Add drop down select on products for category.
Add atter_accessable :category_id to products
Add category to products show page.
Add link to sidebar "create category" if is_admin?.
Add relationship to categories.
Trying to get Categories/show to work.
Add working Categories show page.
Add link for categories to headbar.
Merge branch 'categories' of github.com:AlexZerr/bonediva into categories