initial commit
sim completed
Merge branch 'master' of github.com:fernandezdavid/SIM-Final