grunt file
merge conflict
working on templates