Modeled Reads
Auto marking as read on show for Jobs
Added UnRead Functionality
Added basic index logic
added index filtering logic
Added companies
updated the edit action for companies
added delete button on companies
Merge branch 'index_filtering-david' into companies_and_index_filtering

Conflicts:
	app/controllers/jobs_controller.rb
	app/models/user.rb
	app/views/jobs/index.html.haml
	db/schema.rb
added bullet
Fixed broken controller on merge when user is logged out changed formatting of jobs list
Fixed display of companies post merge
Merge of basic search box
Merge branch 'master' into bullet-riaz
Added bug fixes for index and show
Merge pull request #9 from dhaskew/master

Added bug fixes for index and show
updated items after merge
Merge branch 'master' into bullet-riaz

Conflicts:
	app/controllers/jobs_controller.rb
	app/views/jobs/show.html.haml
fixed display bug on company show page
This fixes #1 regarding n+1 queries