pre-merge job scaffold
fix merge conflicts
fix haml merge conflicts
Rename README.rdoc to README.md
Update README.md
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
fix links from job show