added simulation class
Merge branch 'master' of github.com:cristeprado/qsim

Conflicts:
	qsim2/qsim.py
	qsim2/test.py