Conflicts:
	.gitignore
	.gitmodules
	environment
	gruntfile.coffee
	package.json
	server/views/includes/dependencies.jade
	server/views/includes/ga.jade
	server/views/includes/scripts.jade
	server/views/index.jade
	server/views/layout.jade
	tutorials/git.md
	tutorials/js.md
	tutorials/readme.md