?
Add category_id to paintings
Featured_painting is working but cannot seem to display them on
categories/index
no image showing.
Merge branch 'categories' of github.com:AlexZerr/bonediva into categories

Conflicts:
	db/schema.rb
Add row-fluid to paintings/index & some others
Fix Categories
?
Add category_id to paintings
Featured_painting is working but cannot seem to display them on
categories/index
no image showing.
Add row-fluid to paintings/index & some others
Fix Categories
Merge branch 'categories' of github.com:AlexZerr/bonediva into categories
Merge pull request #10 from AlexZerr/categories

Categories