updates to input file structure
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	cs143sim/simulation.py
Fixed problems in input file structure.. still working on it
Merge remote-tracking branch 'origin/master'

Conflicts:
	cs143sim/actors.py