updated user model with after_create callback add designer role to users
updated profile controller to only grab user.weapons if weapons is not blank
updated profile show view so that only if weapons are not blank will content be display
hooked up dragonfly to s3
remvoed s/ directory (again)
made callback method in weapons model to add entries in StatisticsWeaponDesignQuality when weapon is created
made callback method in design qualities table to add new entry for each weapon if design quality added in StatisticsWeaponDesignQuality
fixed method in battles model to limit beta users to one weapon upload
merge conflict
merge conflict
reverted merge conflict resolution changes to seeds.rb
added cancan authentication to accolades models
adjusted accolades views to links would show only if user has appropriate role
removed extraneous routes
reverted dragonfly s3 storage settings
Merge branch 'chris' of github.com:christiannaths/designbattle into christian
removed junk from project directory
fixed an error in battles controller
updated gemfile for deployment
fixed typo in migration file
removed further extraneous routes
updated SECRET constant to use ENV variable if available (ie, on Heroku)
fixed random fuction for Postgres
fixed custom weapon count beta validation
rerouted accolades show destroy update edit new
added images to accolades for edit and new
accolades images now show on weapns show view