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
prototypes form for battle winner and set controller create to receive params
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
added salt to loser weapon id and test hash in battle controller
extracted encryption salt to a yaml file, added to .gitignore
seed test battles
fixed button generation for battles new view
 styled new view for testing purposes
added hide and show jquery for buttons
removed unnecessary files
updated battle seed to randomize design quality assigned
Merge branch 'hidalgo' of github.com:christiannaths/designbattle