added comment
Merge branch 'master' of github.com:christiannaths/designbattle into hidalgo
Merge branch 'master' of github.com:christiannaths/designbattle into hidalgodev
added mini profiler gem
Merge branch 'hidalgo' of github.com:christiannaths/designbattle
changed battle controller random weapon generation
worked on battles new view
merge conflict
bad merge conflict resolution. fixed.
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