added mini profiler gem
Merge branch 'hidalgo' of github.com:christiannaths/designbattle
merge conflict
bad merge conflict resolution. fixed.
removed logger.warn from battle controller
No longer generating encrypted weapon id tokens in real time
Instead, storing in the db; for speed
Overhauled battles#new and battles#create
Updated the battles#new view
experimented with using Rails Panel (chrome extension)
quieted down server logs in development by enabling standard rack-cache and turing the verbose output option off
shaved off another sql query from the battles#create action
blast. Had to add back in that sql query I 'saved' (see last commit). Couldn't guarantee the order of the weapons using SQL IN statement
fixed user wins/losses counts
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