removed logger.warn from battle controller
added gem cancan
Merge branch 'master' of github.com:christiannaths/designbattle into hidalgodev
added role column to user table
modified seeds.rb for user generation
Merge branch 'hidalgodev' into hidalgo

Conflicts:
	app/controllers/battles_controller.rb
fidex seeding. Prettied it up with the colorize gem