Merge pull request #37 from ianderse/luke

validating for full association. adjust tests to provide objects
add forms for adding deleting show index for items
temporary inline styling to create readable margin between header and content
add ability to edit items
styling
merge conflicts
fix all the category errors...... add ability to add/delete/edit categories
Fix user model for full_name and change tests
Fix merge conflict, users.rb and schema.rb
add ability to choose and edit categories that an item belongs to
views for items, add to cart, needs functionality
added favicon
Merge pull request #46 from ianderse/model-user

Model user
Merge pull request #47 from ianderse/jessica

views for items, add to cart, needs functionality
Implement create account
Fix merge conflict _header.rb
Merge pull request #48 from ianderse/model-user

Model user
update schema
Filtering results for category view
Merge branch 'master' into luke

Conflicts:
	app/models/user.rb
	db/schema.rb