Renamed files
Merge branch 'master' of https://github.com/adrianamorales/OfTheOldBreed

Conflicts:
Update

Up