Returning robot type from xml parser.
Merge branch 'master' of https://github.com/whittenjaw85/pysimiam into test
Merge branch 'test' of github.com:whittenjaw85/pysimiam

Conflicts:
	scripts/simulator.py