Some Small Fixes
Merge branch 'master' of https://github.com/osurdml/flame2.0

Conflicts:
	Flame/TrainAndRun.py
	Flame/population_data.pkl
Need to fix how writing to pkl file