Iniciando processo de workflow:

 Changes to be committed:
	new file:   .bowerrc
	new file:   .editorconfig
	modified:   .gitignore
	new file:   .jshintignore
	new file:   .jshintrc
	new file:   .npmignore
	modified:   LICENSE
	new file:   banner
	new file:   bower.json
	new file:   client/app.min.js
	new file:   client/index.html
	new file:   client/vendor.min.css
	new file:   client/vendor.min.js
	new file:   gulpfile.js
	new file:   karma.conf.js
	new file:   package.json
	new file:   server/boot/authentication.js
	new file:   server/boot/explorer.js
	new file:   server/boot/rest-api.js
	new file:   server/boot/root.js
	new file:   server/config.json
	new file:   server/datasources.json
	new file:   server/model-config.json
	new file:   server/server.js
	new file:   src/app/about/about.controller.js
	new file:   src/app/about/about.tpl.html
	new file:   src/app/app.js
	new file:   src/app/home/home.controller.js
	new file:   src/app/home/home.tpl.html
	new file:   src/assets/js/about.js
	new file:   src/assets/js/home.js
	new file:   src/assets/js/partials.min.js
	new file:   src/index.html
	new file:   test/fail.spec.js
Merge branch 'master' of wesleycoder.tk:tavern.chat into layout

Conflicts:
	.bowerrc
	.jshintignore
	.jshintrc
	bower.json
	gulpfile.js
	karma.conf.js
	package.json
	server/boot/root.js
	server/config.json
	server/datasources.json
	server/server.js
	src/app/about/about.tpl.html
	src/app/app.js
	src/app/home/home.tpl.html
	src/index.html

 Mudanças a serem submetidas:
	modificado: .gitignore
	modificado: .jshintignore
	new file:   banner
	new file:   client/app.min.js
	new file:   client/index.html
	new file:   client/vendor.min.css
	new file:   client/vendor.min.js
	new file:   src/app/about/about.controller.js
	new file:   src/app/home/home.controller.js
	new file:   src/assets/js/about.js
	new file:   src/assets/js/home.js
	new file:   src/assets/js/partials.min.js