oups in .gitignore
Merge branch 'develop-server' into grunt-config
grunt init
grunt config 1.0
Merge branch 'grunt-config' into develop-server