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
Convert all *.erb files to .haml, then delete .erb
integrate nested views with parent
Merge branch 'htmlhaml' of github.com:enilsen16/job_search into users

Conflicts:
	Gemfile
	Gemfile.lock