Fixed merge bullshit
Merge branch 'master' of github.com:derintendant/PIC-Simu

# By IrtazaS
# Via IrtazaS
* 'master' of github.com:derintendant/PIC-Simu:
  File Registers: Bugs Removed
  Revert "Refactoring: Polymorphism"
  Refactoring: Polymorphism

Conflicts:
	PIC-Simu/PSInstruction.m