Timeline fixed still needs improvement
Merge branch 'offer-system' of https://github.com/Hernemaissi/SummerJob into offer-system

Conflicts:
	app/views/companies/_contract_process.html.erb