merging the two versions
Merge branch 'master' of https://github.com/lucascgomes/Job-Offer-Matching

Conflicts:
	job_offer_matching/job_offer_matching/templates/base.html
	job_offer_matching/job_offer_matching/views.py