Conflicts:
	VERSION
	app/assets/stylesheets/pages/groups.scss
	app/models/project.rb
	app/models/snippet.rb
	config/routes.rb
	db/schema.rb