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