delete ds store
Merge branch 'espen' of https://github.com/eevensen/eldev into espen

Conflicts:
	sites/default/.DS_Store
change filename of new tpl php file
Merge branch 'master' of https://github.com/eevensen/eldev into espen