adjusted fight values and position of fight button and avatars
Merge branch 'working'
gulped