img
Merge branch 'master' of https://github.com/FlorentinMonteil/nils-halden

Conflicts:
	css/less/style.less