pre-merge job scaffold
fix merge conflicts
fix haml merge conflicts
Rename README.rdoc to README.md
Update README.md
polymorph
add login with linkedin
add message for omniauth failure
Merge branch 'master' of github.com:enilsen16/job_search into users
finish linkedin login
add password creation
Merge branch 'htmlhaml' of github.com:enilsen16/job_search into users

Conflicts:
	Gemfile
	Gemfile.lock
working polymorph
fix links from job show
polymorism
begin user profile setup
jobs works
stuff
use show action for profile
fix crude actions