+ Added Roles
+Added vouchers (database columns)
+Added organization
+ Added Roles
+Added vouchers (database columns)
+Added organization
+ Added Roles
+Added vouchers (database columns)
+Added organization
Merge remote-tracking branch 'origin/master' into users

Conflicts:
	config/routes.rb
	db/schema.rb