Executed 'bundle install' to fetch and install required Ruby Gems
Executed 'rake db:migrate' (development and test) to migrate all generated migrations which created schema.rb
Executed 'bundle install' to fetch and install required Ruby Gems
Merge branch 'master' of https://github.com/preszke/qz

Conflicts:
	app/assets/javascripts/application.js