changes to reflect nested attributes in user form
 Updated with nested attributes...needs additional edits
completed nested forms, but the coupon paramters are not allowed
added other frontend elements
Mergebranch 'patrick3' need to add the changes?
Merge branch 'master' into coupon_jeff_branch
it sucks
Conflicts:
	db/schema.rb
updated the select field in that add coupon form
Merge branch 'dan'
trying to merge 1 tthing ever
merge
merge search in
Merge branch 'patrick3'merging in serch
removed a typo
merging in jeffs stuff
fixed a nesting error
added work not added in
Merge pull request #12 from piklowry/front_end

added work not added in
updated frontend
Merge pull request #13 from piklowry/front_end

updated frontend
added search to categories page
fixed create pages