commiting to get a pull
Merge branch 'master' of github.com:RoboArmadillo/3dRoboSim

Conflicts:
	sim.py
added some proper usercode
Merge branch 'master' of github.com:RoboArmadillo/3dRoboSim