users can create bundles
Merge branch 'master' of github.com:codeanpeace/project-x

Conflicts:
	app/models/bundle.rb