Made a few changes.... Broken
Merge branch 'master' of https://github.com/osurdml/flame2.0

Conflicts:
	Flame/NeuroAgent.py
	Flame/TrainAndRun.py