Main and Sim Restore
Merge branch 'master' of https://github.com/amelim/RIP-2013-Final

Conflicts:
	python/main.py