logo modifeid
Merge branch 'master' of https://github.com/Hernemaissi/SummerJob

Conflicts:
	app/views/layouts/_header.html.erb