import initial
nom template
Merge branch 'master' of https://github.com/abelass/theme_bertrand

Conflicts:
	.project