Merge pull request #20 from stefanbuck/master

Use module.exports instead of exports
Add jasmine as optional test-framework
Add console.log for return value in example
Merge branch 'feature/jasmine' of https://github.com/kojiwakayama/generator-node-gulp into kojiwakayama-feature/jasmine

* 'feature/jasmine' of https://github.com/kojiwakayama/generator-node-gulp:
  Add jasmine as optional test-framework

Conflicts:
	app/templates/_gulpfile.js
	app/templates/test/name_test.js
Merge branch 'kojiwakayama-feature/jasmine'

* kojiwakayama-feature/jasmine:
  Add jasmine as optional test-framework
Merge branch 'master' into fix/example

* master:
  Use module.exports instead of exports
  bump version 0.5.5
  Update yeoman-genetarot to 0.17
  center logo
  Add generator logo
  Use gulp-plumber for catching jscs error, like catching mocha error
  Add missing 'plugins'
  fix jscs warnings
  bump npm-name version
  Replace removed jscs rules
  Fix repo urls
  bump version
  remove require comments
  Remove deprecated gulp.run()
  Add linebreaks in gulpfiles
  Avoid multiple line break
  Update badge urls
  Fix istanbul test
  add mocha globals
  bump version

Conflicts:
	app/templates/example/simple.js
Merge pull request #22 from kojiwakayama/fix/example

Add console.log for return value in example
Revert "Add console.log for return value in example"
Merge pull request #23 from youngmountain/revert-22-fix/example

Revert "Add console.log for return value in example"
Fix example test
Add console.log for return value in example
Remove duplicate gulp tasks
Fix example test
Merge pull request #24 from kojiwakayama/fix/example

Fix example test
Merge pull request #25 from kojiwakayama/fix/gulpfile

Remove duplicate gulp tasks
Merge pull request #26 from stefanbuck/master

Run `gulp test` on the generated project
add options description
bump version 0.6.0
Update README.md
Update README.md