Generated scaffold for DesignQualities
added Accolades scaffold
conflict resolution
created Accolades MVC
conflict resolution
fixed bot weapon seeding
added new seed weapon images. Cleaned up weapon views
generated battles mvc - worked on random weapon gen in controller
generated scaffold for battle. worked on controller with random weapon gen
merge conflict
merge conflict
fixed a bug in the seeds file re: assigning weapon images to bots
prototypes form for battle winner and set controller create to receive params
added gem to clean up rails server logs
seeds design qualities then generated battles new view submit buttons
Merge branch 'master' of github.com:christiannaths/designbattle into hidalgodev
encrypted weapon winner id and changed controller to test encryption prior to save
 added validations to battle model

Conflicts:
	db/seeds.rb