pre-merge job scaffold
fix merge conflicts
Merge branch 'master' of https://github.com/enilsen16/job_search
Merge branch 'haml' of https://github.com/enilsen16/job_search
Merge branch 'master' of https://github.com/enilsen16/job_search
fix haml merge conflicts
Convert all *.erb files to .haml, then delete .erb
add login with linkedin
add message for omniauth failure
Merge branch 'master' of github.com:enilsen16/job_search into users
finish linkedin login
integrate nested views with parent
add password creation
Merge branch 'htmlhaml' of github.com:enilsen16/job_search into users

Conflicts:
	Gemfile
	Gemfile.lock
begin user profile setup
use show action for profile
user authentication, except cannot add new omniauth accounts
add authentication
Merge pull request #26 from enilsen16/users

Users