Edited rifle1/2.jpg for issue #181:

 - Edited the concept art for the rifle, now there are numbers to identify
   each model.
Merge branch 'Grupo-A' of https://github.com/eloipuertas/ES2013Dimarts into Grupo-A