grunt and config files
package and gitignore merge conflict fixed