commented out main method inside of simulator.java. tj says he is moving
it to a different class. Besides, main wasn't working with his new
changes.
Merge branch 'robDev'